diff options
| author | Alex Woods <devnull@localhost> | 2003-06-22 12:14:46 +0000 |
|---|---|---|
| committer | Alex Woods <devnull@localhost> | 2003-06-22 12:14:46 +0000 |
| commit | 5f49c5a0e30a742f8607e0a4e744587db8ed3a00 (patch) | |
| tree | 2b6a52e239f41f507aa69c394d6a0b910f92de81 /linux/drivers/media/dvb/dvb-core | |
| parent | fa424863e7af7e98d93fd296469a86ef6cfddbe5 (diff) | |
| download | mediapointer-dvb-s2-5f49c5a0e30a742f8607e0a4e744587db8ed3a00.tar.gz mediapointer-dvb-s2-5f49c5a0e30a742f8607e0a4e744587db8ed3a00.tar.bz2 | |
Rollback to munges and split usb compat stuff out to fix building
against 2.4 and 2.5 kernels.
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_compat.h | 14 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_usb_compat.h | 17 |
2 files changed, 17 insertions, 14 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_compat.h b/linux/drivers/media/dvb/dvb-core/dvb_compat.h index 71488ab6e..980b4cd85 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_compat.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_compat.h @@ -102,19 +102,5 @@ extern struct page * vmalloc_to_page(void *addr); #include <linux/workqueue.h> #endif - -/* USB compatibility */ - -#include <linux/usb.h> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) -typedef struct iso_packet_descriptor usb_iso_packet_descriptor; -#define URB_ISO_ASAP USB_ISO_ASAP -#undef usb_alloc_urb -#undef usb_submit_urb -#define usb_alloc_urb(urb,flags) usb_alloc_urb(urb) -#define usb_submit_urb(urb,flags) usb_submit_urb(urb) -#endif - #endif diff --git a/linux/drivers/media/dvb/dvb-core/dvb_usb_compat.h b/linux/drivers/media/dvb/dvb-core/dvb_usb_compat.h new file mode 100644 index 000000000..f80ac9ef3 --- /dev/null +++ b/linux/drivers/media/dvb/dvb-core/dvb_usb_compat.h @@ -0,0 +1,17 @@ +#ifndef __MORECRAP_H +#define __MORECRAP_H + +/* USB compatibility */ + +#include <linux/usb.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) +typedef struct iso_packet_descriptor usb_iso_packet_descriptor; +#define URB_ISO_ASAP USB_ISO_ASAP +#define URB_MEM_FLAG +#else +#define URB_MEM_FLAG , GFP_KERNEL +#endif + +#endif + |