diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-12 02:10:06 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-12 02:10:06 -0200 |
| commit | 5021ce47870d8ce6b8efe93938138795dcc16553 (patch) | |
| tree | 1a21631be8d469ae591d7d997bd1f378287a526a /v4l | |
| parent | d2fdf36ebdc0970621958a5b6a7df809ed103bf8 (diff) | |
| parent | a3c3f7456fd59e54b7c0333ca9bb32b8be70044e (diff) | |
| download | mediapointer-dvb-s2-5021ce47870d8ce6b8efe93938138795dcc16553.tar.gz mediapointer-dvb-s2-5021ce47870d8ce6b8efe93938138795dcc16553.tar.bz2 | |
merge: http://linuxtv.org/hg/~awalls/cx18-bugfix
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 24 | ||||
| -rw-r--r-- | v4l/versions.txt | 1 |
2 files changed, 16 insertions, 9 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index 7325e15c4..57b1aba8d 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -18,6 +18,7 @@ #ifdef CONFIG_PROC_FS #include <linux/module.h> #include <linux/proc_fs.h> +#include <linux/device.h> #endif #endif @@ -210,6 +211,10 @@ static inline struct proc_dir_entry *proc_create_data(const char *a, #define hweight64(x) generic_hweight64(x) #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) +typedef unsigned long uintptr_t; +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) #define div64_u64(a,b) div64_64(a,b) @@ -219,20 +224,17 @@ static inline struct proc_dir_entry *proc_create_data(const char *a, ( h ), \ ( x ) ) ) -#define dev_name(dev) ((dev)->bus_id) - -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) -typedef unsigned long uintptr_t; -#endif - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) static inline int list_is_singular(const struct list_head *head) { return !list_empty(head) && (head->next == head->prev); } +#define dev_name(dev) ((dev)->bus_id) + +#define dev_set_name(dev, fmt, arg...) ({ \ + snprintf((dev)->bus_id, sizeof((dev)->bus_id), fmt , ## arg); \ + 0; \ +}) #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) @@ -250,6 +252,10 @@ static inline int list_is_singular(const struct list_head *head) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 28) #define snd_BUG_ON(cond) WARN((cond), "BUG? (%s)\n", __stringify(cond)) + +#define pci_ioremap_bar(pci, a) \ + ioremap_nocache(pci_resource_start(pci, a), \ + pci_resource_len(pci, a)) #endif #ifndef PCI_DEVICE_ID_MARVELL_88ALP01_CCIC diff --git a/v4l/versions.txt b/v4l/versions.txt index 2b3ec7638..576af0ecd 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -45,6 +45,7 @@ USB_S2255 VIDEO_USBVISION # Uses supports_autosuspend USB_MR800 +USB_DSBR # Uses remap_vmalloc_range() [2.6.18] |