diff options
| author | Michael Hunold <devnull@localhost> | 2003-05-06 14:27:56 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2003-05-06 14:27:56 +0000 |
| commit | e4e3a26f4c976328c77dc109828f8e41acf27f37 (patch) | |
| tree | 5c9bb2de4a08b97c8bbd420fe0cd8a9742d8637a /linux/drivers/media | |
| parent | 48e25cdc73a979d86cceeebd9d64918130f9079f (diff) | |
| download | mediapointer-dvb-s2-e4e3a26f4c976328c77dc109828f8e41acf27f37.tar.gz mediapointer-dvb-s2-e4e3a26f4c976328c77dc109828f8e41acf27f37.tar.bz2 | |
Remove the ttusb-* drivers from the makelinks script and the
build process again, due to the unknown licensing issues with
the firmware.
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/Kconfig | 12 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/Makefile | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 11 |
3 files changed, 14 insertions, 11 deletions
diff --git a/linux/drivers/media/dvb/Kconfig b/linux/drivers/media/dvb/Kconfig index 4735c121c..c251f705e 100644 --- a/linux/drivers/media/dvb/Kconfig +++ b/linux/drivers/media/dvb/Kconfig @@ -33,15 +33,15 @@ source "drivers/media/dvb/dvb-core/Kconfig" source "drivers/media/dvb/frontends/Kconfig" comment "Supported SAA7146 based PCI Adapters" - depends on DVB + depends on DVB && PCI source "drivers/media/dvb/ttpci/Kconfig" -comment "Supported USB Adapters" - depends on DVB && USB - -source "drivers/media/dvb/ttusb-budget/Kconfig" -source "drivers/media/dvb/ttusb-dec/Kconfig" +#comment "Supported USB Adapters" +# depends on DVB && USB +# +#source "drivers/media/dvb/ttusb-budget/Kconfig" +#source "drivers/media/dvb/ttusb-dec/Kconfig" endmenu diff --git a/linux/drivers/media/dvb/Makefile b/linux/drivers/media/dvb/Makefile index e65d885cf..a0283c4f6 100644 --- a/linux/drivers/media/dvb/Makefile +++ b/linux/drivers/media/dvb/Makefile @@ -2,4 +2,4 @@ # Makefile for the kernel multimedia device drivers. # -obj-y := dvb-core/ frontends/ ttpci/ ttusb-dec/ ttusb-budget/ +obj-y := dvb-core/ frontends/ ttpci/ # ttusb-dec/ ttusb-budget/ diff --git a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index 5afc92b0c..1922128ae 100644 --- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c @@ -29,7 +29,6 @@ #include <linux/pci.h> #include "dvb_functions.h" -#include "dvb_compat.h" /* TTUSB_HWSECTIONS: @@ -62,7 +61,7 @@ static int debug = 1; #define TTUSB_MAXFILTER 16 /* ??? */ #endif - +#define TTUSB_BUDGET_NAME "ttusb_stc_fw" /** * since we're casting (struct ttusb*) <-> (struct dvb_demux*) around @@ -1171,7 +1170,7 @@ int ttusb_probe (struct usb_interface *intf, err: ttusb->stc_devfs_handle = devfs_register( ttusb->adapter->devfs_handle, - "ttusb_stc_fw", + TTUSB_BUDGET_NAME, DEVFS_FL_DEFAULT, 0, 192, S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH, @@ -1205,7 +1204,11 @@ void ttusb_disconnect (struct usb_interface *intf) ttusb_stop_iso_xfer (ttusb); - devfs_unregister(ttusb->stc_devfs_handle); +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69)) + #undef devfs_remove + #define devfs_remove(x) devfs_unregister(ttusb->stc_devfs_handle); +#endif + devfs_remove(TTUSB_BUDGET_NAME); ttusb->dvb_demux.dmx.close(&ttusb->dvb_demux.dmx); dvb_net_release(&ttusb->dvbnet); |