diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-11 07:39:53 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-11 07:39:53 -0200 |
| commit | 44fb259c62c95f15516f65a961483476ad226ff6 (patch) | |
| tree | f21dc593a3bae6bdc39109a22f784deae3087dc2 /linux | |
| parent | 28615ed3424329580117e65a34106ca408bf564b (diff) | |
| download | mediapointer-dvb-s2-44fb259c62c95f15516f65a961483476ad226ff6.tar.gz mediapointer-dvb-s2-44fb259c62c95f15516f65a961483476ad226ff6.tar.bz2 | |
Backport a few minor changes from upstream
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Documentation/video4linux/bttv/CONTRIBUTORS | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/Makefile | 1 | ||||
| -rw-r--r-- | linux/sound/pci/bt87x.c | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/linux/Documentation/video4linux/bttv/CONTRIBUTORS b/linux/Documentation/video4linux/bttv/CONTRIBUTORS index 8aad6dd93..eb41b2650 100644 --- a/linux/Documentation/video4linux/bttv/CONTRIBUTORS +++ b/linux/Documentation/video4linux/bttv/CONTRIBUTORS @@ -3,7 +3,7 @@ Contributors to bttv: Michael Chu <mmchu@pobox.com> AverMedia fix and more flexible card recognition -Alan Cox <alan@redhat.com> +Alan Cox <alan@lxorguk.ukuu.org.uk> Video4Linux interface and 2.1.x kernel adaptation Chris Kleitsch diff --git a/linux/drivers/media/dvb/frontends/Makefile b/linux/drivers/media/dvb/frontends/Makefile index fd24de4ae..7a19c0c7b 100644 --- a/linux/drivers/media/dvb/frontends/Makefile +++ b/linux/drivers/media/dvb/frontends/Makefile @@ -6,7 +6,6 @@ EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/ 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 --git a/linux/sound/pci/bt87x.c b/linux/sound/pci/bt87x.c index 0dd872610..8b6868462 100644 --- a/linux/sound/pci/bt87x.c +++ b/linux/sound/pci/bt87x.c @@ -775,8 +775,7 @@ static int __devinit snd_bt87x_create(struct snd_card *card, 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; |