- removed the compatibility crap around KBUILD_MODNAME from all drivers,

  use  KBUILD_BASENAME for 2.4 instead
­ some changes to the i2c core to make it work with both 2.4 and late 2.5
  kernels (not done yet -- only interesting for analog drivers)
- add MODULE_DEVICE_TABLE to all drivers, so that pci "hotplug" can detect
  the devices automatically. Alan Cox says, that we should use this to load
  the firmware (not done yet)
- fix the long standing "insmod/rmmod with multiple budget cards" bug -- it
  was a double kfree() call...

2 files changed, 4 insertions, 8 deletions

diff --git a/linux/drivers/media/video/dpc7146.c b/linux/drivers/media/video/dpc7146.c
index ee2eb280f..403bbca5e 100644
--- a/linux/drivers/media/video/dpc7146.c
+++ b/linux/drivers/media/video/dpc7146.c
@@ -23,10 +23,6 @@
 #include <media/saa7146_vv.h>
 #include <linux/video_decoder.h>	/* for saa7111a */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#define KBUILD_MODNAME dpc7146
-#endif
-
 #define I2C_SAA7111A            0x24
 
 /* All unused bytes are reserverd. */
@@ -340,6 +336,8 @@ struct pci_device_id pci_tbl[] = {
 	}
 };
 
+MODULE_DEVICE_TABLE(pci, pci_tbl);
+
 static
 struct saa7146_ext_vv vv_data = {
 	.inputs		= DPC_INPUTS,
diff --git a/linux/drivers/media/video/mxb.c b/linux/drivers/media/video/mxb.c
index b602a1d26..2463987b4 100644
--- a/linux/drivers/media/video/mxb.c
+++ b/linux/drivers/media/video/mxb.c
@@ -26,10 +26,6 @@
 #include <media/saa7146_vv.h>
 #include <linux/video_decoder.h>	/* for saa7111a */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,51)
-	#define KBUILD_MODNAME mxb
-#endif
-
 #include "mxb.h"
 #include "tea6415c.h"
 #include "tea6420.h"
@@ -1030,6 +1026,8 @@ struct pci_device_id pci_tbl[] = {
 	}
 };
 
+MODULE_DEVICE_TABLE(pci, pci_tbl);
+
 static
 struct saa7146_ext_vv vv_data = {
 	.inputs		= MXB_INPUTS,