diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-07 15:29:32 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-12-07 15:29:32 +0000 |
| commit | 0b34b6c3504db2f4623703d18b7ee1430b05e022 (patch) | |
| tree | 3a0d0abbb26302a67dd3783d1f374e3a9d70ed6c | |
| parent | d4648ece00285c4641ea318f8825c39d1325ccbb (diff) | |
| download | mediapointer-dvb-s2-0b34b6c3504db2f4623703d18b7ee1430b05e022.tar.gz mediapointer-dvb-s2-0b34b6c3504db2f4623703d18b7ee1430b05e022.tar.bz2 | |
Reverted a wrong commit at the previous patch.
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
| -rw-r--r-- | linux/drivers/media/video/bttv-driver.c | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c index 1002e3a91..25d1fe218 100644 --- a/linux/drivers/media/video/bttv-driver.c +++ b/linux/drivers/media/video/bttv-driver.c @@ -1,5 +1,5 @@ /* - $Id: bttv-driver.c,v 1.78 2005/12/07 14:17:02 mchehab Exp $ + $Id: bttv-driver.c,v 1.79 2005/12/07 15:29:32 mchehab Exp $ bttv - Bt848 frame grabber driver @@ -4311,11 +4311,7 @@ static int bttv_init_module(void) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) bus_register(&bttv_sub_bus_type); #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15) - return pci_module_init(&bttv_pci_driver); -#else return pci_register_driver(&bttv_pci_driver); -#endif } static void bttv_cleanup_module(void) diff --git a/v4l/ChangeLog b/v4l/ChangeLog index bef0dddba..b4750fcc5 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,11 @@ +2005-12-07 15:27 mchehab + + * linux/drivers/media/video/bttv-driver.c: + + - Reverted a wrong commit at the previous patch. + + Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> + 2005-12-07 14:12 mchehab * linux/drivers/media/video/bttv-driver.c: |