diff --git a/CHANGES b/CHANGES index e7ac2240..33ad8210 100644 --- a/CHANGES +++ b/CHANGES @@ -19,6 +19,7 @@ ask CVS about it: 2.6.2 (2001????) Chip Modules (all): malloc.h -> slab.h + Modules (all): Add MODULE_LICENSE("GPL") File doc/FAQ: More updates and additions Module fscpos: new (Fujitsu-Siemens Poseidon driver) Module i2c-amd756: Improve busy handling/printk's diff --git a/kernel/busses/i2c-ali1535.c b/kernel/busses/i2c-ali1535.c index bfca2e88..c2253714 100644 --- a/kernel/busses/i2c-ali1535.c +++ b/kernel/busses/i2c-ali1535.c @@ -64,9 +64,12 @@ #include #include #include "version.h" - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #ifndef DECLARE_MUTEX #define DECLARE_MUTEX(name) struct semaphore name = MUTEX #endif /* def DECLARE_MUTEX */ diff --git a/kernel/busses/i2c-ali15x3.c b/kernel/busses/i2c-ali15x3.c index 8e4c330d..ff10a9a8 100644 --- a/kernel/busses/i2c-ali15x3.c +++ b/kernel/busses/i2c-ali15x3.c @@ -70,9 +70,12 @@ #include #include #include "version.h" - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + /* ALI15X3 SMBus address offsets */ #define SMBHSTSTS (0 + ali15x3_smba) #define SMBHSTCNT (1 + ali15x3_smba) @@ -93,7 +96,7 @@ #define SMBREV 0x008 /* Other settings */ -#define MAX_TIMEOUT 500 /* times 1/100 sec */ +#define MAX_TIMEOUT 200 /* times 1/100 sec */ #define ALI15X3_SMB_IOSIZE 32 /* this is what the Award 1004 BIOS sets them to on a ASUS P5A MB. @@ -179,7 +182,7 @@ static struct i2c_adapter ali15x3_adapter = { static int __initdata ali15x3_initialized; static unsigned short ali15x3_smba = 0; - +static int locked=0; /* Detect whether a ALI15X3 can be found, and initialize it, where necessary. Note the differences between kernels with the old PCI BIOS interface and diff --git a/kernel/busses/i2c-amd756.c b/kernel/busses/i2c-amd756.c index 9e2532fb..f64ac91d 100644 --- a/kernel/busses/i2c-amd756.c +++ b/kernel/busses/i2c-amd756.c @@ -39,9 +39,12 @@ #include #include #include "version.h" - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #ifndef PCI_DEVICE_ID_AMD_756 #define PCI_DEVICE_ID_AMD_756 0x740B #endif diff --git a/kernel/busses/i2c-hydra.c b/kernel/busses/i2c-hydra.c index d2e7ec12..0d1bd0ec 100644 --- a/kernel/busses/i2c-hydra.c +++ b/kernel/busses/i2c-hydra.c @@ -31,12 +31,14 @@ #include #include #include - #include #include - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + /* PCI device */ #define VENDOR PCI_VENDOR_ID_APPLE #define DEVICE PCI_DEVICE_ID_APPLE_HYDRA diff --git a/kernel/busses/i2c-i801.c b/kernel/busses/i2c-i801.c index f6383ac8..8239be48 100644 --- a/kernel/busses/i2c-i801.c +++ b/kernel/busses/i2c-i801.c @@ -47,6 +47,10 @@ #include #include "version.h" +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #ifndef PCI_DEVICE_ID_INTEL_82801AA_3 #define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413 #endif diff --git a/kernel/busses/i2c-i810.c b/kernel/busses/i2c-i810.c index e7dc8414..21b11a66 100644 --- a/kernel/busses/i2c-i810.c +++ b/kernel/busses/i2c-i810.c @@ -43,6 +43,10 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + /* PCI defines */ #ifndef PCI_DEVICE_ID_INTEL_82810_IG1 #define PCI_DEVICE_ID_INTEL_82810_IG1 0x7121 diff --git a/kernel/busses/i2c-isa.c b/kernel/busses/i2c-isa.c index 352facad..70358ebf 100644 --- a/kernel/busses/i2c-isa.c +++ b/kernel/busses/i2c-isa.c @@ -27,14 +27,14 @@ #include #include #include - #include - - #include - #include "version.h" +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + static void isa_inc_use(struct i2c_adapter *adapter); static void isa_dec_use(struct i2c_adapter *adapter); static u32 isa_func(struct i2c_adapter *adapter); diff --git a/kernel/busses/i2c-keywest.c b/kernel/busses/i2c-keywest.c index 9b8564b4..5051bf50 100644 --- a/kernel/busses/i2c-keywest.c +++ b/kernel/busses/i2c-keywest.c @@ -29,12 +29,9 @@ #include #include #include - #include - #include #include - #include // #include // #include @@ -43,6 +40,9 @@ #include // #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif #define POLL_SANITY 100 diff --git a/kernel/busses/i2c-piix4.c b/kernel/busses/i2c-piix4.c index cd9c5b5d..140c11fc 100644 --- a/kernel/busses/i2c-piix4.c +++ b/kernel/busses/i2c-piix4.c @@ -38,9 +38,12 @@ #include #include #include "version.h" - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + /* Note: We assume all devices are identical to the Intel PIIX4; we only mention it during detection. */ diff --git a/kernel/busses/i2c-sis5595.c b/kernel/busses/i2c-sis5595.c index 63ed91ee..1d287a1d 100644 --- a/kernel/busses/i2c-sis5595.c +++ b/kernel/busses/i2c-sis5595.c @@ -57,9 +57,12 @@ #include #include #include "version.h" - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #ifndef PCI_DEVICE_ID_SI_540 #define PCI_DEVICE_ID_SI_540 0x0540 #endif diff --git a/kernel/busses/i2c-tsunami.c b/kernel/busses/i2c-tsunami.c index e86c92ff..2f08948d 100644 --- a/kernel/busses/i2c-tsunami.c +++ b/kernel/busses/i2c-tsunami.c @@ -31,16 +31,18 @@ #include #include - #include #include #include - #include #include #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + /* Memory Presence Detect Register (MPD-RW) bits with except of reserved RAZ bits */ diff --git a/kernel/busses/i2c-via.c b/kernel/busses/i2c-via.c index 7c19a35a..1176560d 100644 --- a/kernel/busses/i2c-via.c +++ b/kernel/busses/i2c-via.c @@ -28,13 +28,15 @@ #include #include #include - #include #include #include "version.h" - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + /* PCI device */ #define VENDOR PCI_VENDOR_ID_VIA #define DEVICE PCI_DEVICE_ID_VIA_82C586_3 diff --git a/kernel/busses/i2c-viapro.c b/kernel/busses/i2c-viapro.c index e895a82f..6a0547fa 100644 --- a/kernel/busses/i2c-viapro.c +++ b/kernel/busses/i2c-viapro.c @@ -39,9 +39,12 @@ #include #include #include "version.h" - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #ifndef PCI_DEVICE_ID_VIA_82C596_3 #define PCI_DEVICE_ID_VIA_82C596_3 0x3050 #endif diff --git a/kernel/busses/i2c-voodoo3.c b/kernel/busses/i2c-voodoo3.c index ee5376e0..59375567 100644 --- a/kernel/busses/i2c-voodoo3.c +++ b/kernel/busses/i2c-voodoo3.c @@ -36,6 +36,10 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + /* 3DFX defines */ #ifndef PCI_DEVICE_ID_3DFX_VOODOO3 #define PCI_DEVICE_ID_3DFX_VOODOO3 0x05 diff --git a/kernel/chips/adm1021.c b/kernel/chips/adm1021.c index 196e3f2d..fa4432b3 100644 --- a/kernel/chips/adm1021.c +++ b/kernel/chips/adm1021.c @@ -25,9 +25,12 @@ #include #include "sensors.h" #include "version.h" - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/adm1025.c b/kernel/chips/adm1025.c index 9bd197ec..62c41b61 100644 --- a/kernel/chips/adm1025.c +++ b/kernel/chips/adm1025.c @@ -36,6 +36,10 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/adm9240.c b/kernel/chips/adm9240.c index ef644f5a..4bdf9dd6 100644 --- a/kernel/chips/adm9240.c +++ b/kernel/chips/adm9240.c @@ -62,6 +62,10 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/bt869.c b/kernel/chips/bt869.c index 64df234a..57ff269c 100644 --- a/kernel/chips/bt869.c +++ b/kernel/chips/bt869.c @@ -29,6 +29,10 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/ddcmon.c b/kernel/chips/ddcmon.c index fbc3d03f..9a7879dd 100644 --- a/kernel/chips/ddcmon.c +++ b/kernel/chips/ddcmon.c @@ -26,9 +26,12 @@ #include #include "sensors.h" #include "version.h" - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/ds1621.c b/kernel/chips/ds1621.c index cfd61c1a..346e3615 100644 --- a/kernel/chips/ds1621.c +++ b/kernel/chips/ds1621.c @@ -29,6 +29,9 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) diff --git a/kernel/chips/eeprom.c b/kernel/chips/eeprom.c index 254f5942..a5ffdafe 100644 --- a/kernel/chips/eeprom.c +++ b/kernel/chips/eeprom.c @@ -25,9 +25,12 @@ #include #include "sensors.h" #include "version.h" - #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/fscpos.c b/kernel/chips/fscpos.c index 60f6a4be..453ec931 100644 --- a/kernel/chips/fscpos.c +++ b/kernel/chips/fscpos.c @@ -39,6 +39,10 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/gl518sm.c b/kernel/chips/gl518sm.c index 2097ed19..3fa86fc5 100644 --- a/kernel/chips/gl518sm.c +++ b/kernel/chips/gl518sm.c @@ -26,13 +26,15 @@ #include #include "sensors.h" #include "version.h" - #include - #ifdef __SMP__ #include #endif +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/gl520sm.c b/kernel/chips/gl520sm.c index a1cf6b9e..90e41a87 100644 --- a/kernel/chips/gl520sm.c +++ b/kernel/chips/gl520sm.c @@ -28,6 +28,10 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/icspll.c b/kernel/chips/icspll.c index 00b408c3..8c0c28f3 100644 --- a/kernel/chips/icspll.c +++ b/kernel/chips/icspll.c @@ -37,6 +37,9 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) diff --git a/kernel/chips/it87.c b/kernel/chips/it87.c index 40cd684f..3c6bebe3 100644 --- a/kernel/chips/it87.c +++ b/kernel/chips/it87.c @@ -45,6 +45,10 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/lm75.c b/kernel/chips/lm75.c index 07489ffc..e07b877d 100644 --- a/kernel/chips/lm75.c +++ b/kernel/chips/lm75.c @@ -26,6 +26,9 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) diff --git a/kernel/chips/lm78.c b/kernel/chips/lm78.c index aecb2eea..e06bb3a4 100644 --- a/kernel/chips/lm78.c +++ b/kernel/chips/lm78.c @@ -32,6 +32,10 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/lm80.c b/kernel/chips/lm80.c index 42104596..741d1fee 100644 --- a/kernel/chips/lm80.c +++ b/kernel/chips/lm80.c @@ -33,6 +33,10 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/lm87.c b/kernel/chips/lm87.c index 22c172ff..d6cd4cc8 100644 --- a/kernel/chips/lm87.c +++ b/kernel/chips/lm87.c @@ -36,6 +36,9 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif /* Chip configuration settings. These should be set to reflect the HARDWARE configuration of your chip. By default (read: when all of diff --git a/kernel/chips/ltc1710.c b/kernel/chips/ltc1710.c index 3aa919f7..0c88f7ca 100644 --- a/kernel/chips/ltc1710.c +++ b/kernel/chips/ltc1710.c @@ -49,6 +49,9 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) diff --git a/kernel/chips/matorb.c b/kernel/chips/matorb.c index f89eb3f0..52665ca6 100644 --- a/kernel/chips/matorb.c +++ b/kernel/chips/matorb.c @@ -30,6 +30,10 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/maxilife.c b/kernel/chips/maxilife.c index f8938dc9..d91f1c72 100644 --- a/kernel/chips/maxilife.c +++ b/kernel/chips/maxilife.c @@ -65,6 +65,9 @@ static const char *version_str = "2.00 29/2/2000 Fons Rademakers"; #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) diff --git a/kernel/chips/mtp008.c b/kernel/chips/mtp008.c index db6aabff..cc4966c6 100644 --- a/kernel/chips/mtp008.c +++ b/kernel/chips/mtp008.c @@ -32,6 +32,10 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/pcf8574.c b/kernel/chips/pcf8574.c index 7c13ecb9..51d7640c 100644 --- a/kernel/chips/pcf8574.c +++ b/kernel/chips/pcf8574.c @@ -46,6 +46,9 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) diff --git a/kernel/chips/sis5595.c b/kernel/chips/sis5595.c index 6f1367c9..8427a08c 100644 --- a/kernel/chips/sis5595.c +++ b/kernel/chips/sis5595.c @@ -58,6 +58,9 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) diff --git a/kernel/chips/thmc50.c b/kernel/chips/thmc50.c index 14e42c11..7a5dfd55 100644 --- a/kernel/chips/thmc50.c +++ b/kernel/chips/thmc50.c @@ -29,6 +29,10 @@ #include "version.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0) diff --git a/kernel/chips/via686a.c b/kernel/chips/via686a.c index fcecdb29..7e052312 100644 --- a/kernel/chips/via686a.c +++ b/kernel/chips/via686a.c @@ -46,6 +46,10 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #ifndef PCI_DEVICE_ID_VIA_82C686_4 #define PCI_DEVICE_ID_VIA_82C686_4 0x3057 #endif diff --git a/kernel/chips/w83781d.c b/kernel/chips/w83781d.c index 0b2f5040..ecc17f19 100644 --- a/kernel/chips/w83781d.c +++ b/kernel/chips/w83781d.c @@ -46,6 +46,10 @@ #include "sensors.h" #include +#ifdef MODULE_LICENSE +MODULE_LICENSE("GPL"); +#endif + #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)) || \ (LINUX_VERSION_CODE == KERNEL_VERSION(2,3,0)) #define init_MUTEX(s) do { *(s) = MUTEX; } while(0)