diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 10:58:02 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 10:58:02 -0200 |
| commit | 4bed69bfcb36161bcd89a7a61b6a912c32fea813 (patch) | |
| tree | b40092bb4cc41424343b1a4fd3d90b63f7f01fb3 /v4l | |
| parent | f7addb7035dedd9ba701c586fec16b234dde4a77 (diff) | |
| parent | c6f9ed52d0eb5d04c1c65914976d81315a872839 (diff) | |
| download | mediapointer-dvb-s2-4bed69bfcb36161bcd89a7a61b6a912c32fea813.tar.gz mediapointer-dvb-s2-4bed69bfcb36161bcd89a7a61b6a912c32fea813.tar.bz2 | |
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo
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 | 4 | ||||
| -rw-r--r-- | v4l/versions.txt | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index d041cbe38..98f57879b 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -252,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 1b45f34ec..3ef9af5d8 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -43,6 +43,7 @@ USB_S2255 VIDEO_USBVISION # Uses supports_autosuspend USB_MR800 +USB_DSBR # Uses remap_vmalloc_range() [2.6.18] |