The patch number 9573 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
Backport a few minor changes from upstream
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/Documentation/video4linux/bttv/CONTRIBUTORS | 2 +-
linux/drivers/media/dvb/frontends/Makefile | 1 -
linux/sound/pci/bt87x.c | 3 +--
v4l/compat.h | 4 ++++
4 files changed, 6 insertions(+), 4 deletions(-)
diff -r bb00cb692462 -r 1251a4091b89
linux/Documentation/video4linux/bttv/CONTRIBUTORS
--- a/linux/Documentation/video4linux/bttv/CONTRIBUTORS Mon Nov 10 19:56:20
2008 -0200
+++ b/linux/Documentation/video4linux/bttv/CONTRIBUTORS Tue Nov 11 07:39:53
2008 -0200
@@ -3,7 +3,7 @@ Michael Chu <[EMAIL PROTECTED]>
Michael Chu <[EMAIL PROTECTED]>
AverMedia fix and more flexible card recognition
-Alan Cox <[EMAIL PROTECTED]>
+Alan Cox <[EMAIL PROTECTED]>
Video4Linux interface and 2.1.x kernel adaptation
Chris Kleitsch
diff -r bb00cb692462 -r 1251a4091b89 linux/drivers/media/dvb/frontends/Makefile
--- a/linux/drivers/media/dvb/frontends/Makefile Mon Nov 10 19:56:20
2008 -0200
+++ b/linux/drivers/media/dvb/frontends/Makefile Tue Nov 11 07:39:53
2008 -0200
@@ -6,7 +6,6 @@ EXTRA_CFLAGS += -Idrivers/media/common/t
EXTRA_CFLAGS += -Idrivers/media/common/tuners/
s921-objs := s921_module.o s921_core.o
-
stb0899-objs = stb0899_drv.o stb0899_algo.o
obj-$(CONFIG_DVB_PLL) += dvb-pll.o
diff -r bb00cb692462 -r 1251a4091b89 linux/sound/pci/bt87x.c
--- a/linux/sound/pci/bt87x.c Mon Nov 10 19:56:20 2008 -0200
+++ b/linux/sound/pci/bt87x.c Tue Nov 11 07:39:53 2008 -0200
@@ -775,8 +775,7 @@ static int __devinit snd_bt87x_create(st
pci_disable_device(pci);
return err;
}
- chip->mmio = ioremap_nocache(pci_resource_start(pci, 0),
- pci_resource_len(pci, 0));
+ chip->mmio = pci_ioremap_bar(pci, 0);
if (!chip->mmio) {
snd_printk(KERN_ERR "cannot remap io memory\n");
err = -ENOMEM;
diff -r bb00cb692462 -r 1251a4091b89 v4l/compat.h
--- a/v4l/compat.h Mon Nov 10 19:56:20 2008 -0200
+++ b/v4l/compat.h Tue Nov 11 07:39:53 2008 -0200
@@ -252,6 +252,10 @@ static inline int list_is_singular(const
#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
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/1251a4091b89b30d0db79994f30af2ef234d1bfb
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
