Changeset 4039

Timestamp:

06/05/06 09:55:07 (7 years ago)

Author:

khali

Message:

i2c-viapro.c: Move definition of PCI IDs before they are used.
This fixes compilation with old kernels (2.4.20 and earlier). Thanks
to Yuan Mu for reporting.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/busses/i2c-viapro.c (modified) (2 diffs)

lm-sensors/trunk/CHANGES

@@ -16 +16 @@
                    Add ICH8 support (2.6 backport)
   Module i2c-piix4: Add ServerWorks HT-1000 support (2.6 backport)
+  Module i2c-viapro: Fix compilation with kernels < 2.4.21
   Module w83781d: Use real-time alarm registers when possible (2.6 backport)
   Program decode-dimms.pl: Decode depending on the memory type

lm-sensors/trunk/kernel/busses/i2c-viapro.c

@@ -49 +49 @@
 #include "version.h"
 #include "sensors_compat.h"
+
+/* 8233A is undefined before kernel 2.4.19 */
+#ifndef PCI_DEVICE_ID_VIA_8233A
+#define PCI_DEVICE_ID_VIA_8233A 0x3147
+#endif
+/* 8235 is undefined before kernel 2.4.21 */
+#ifndef PCI_DEVICE_ID_VIA_8235
+#define PCI_DEVICE_ID_VIA_8235  0x3177
+#endif
+/* 8237 is undefined before kernel 2.4.21 */
+#ifndef PCI_DEVICE_ID_VIA_8237
+#define PCI_DEVICE_ID_VIA_8237  0x3227
+#endif
 
 #define SMBBA1          0x90
@@ -421 +434 @@
 }
 
-/* 8233A is undefined before kernel 2.4.19 */
-#ifndef PCI_DEVICE_ID_VIA_8233A
-#define PCI_DEVICE_ID_VIA_8233A 0x3147
-#endif
-/* 8235 is undefined before kernel 2.4.20 */
-#ifndef PCI_DEVICE_ID_VIA_8235
-#define PCI_DEVICE_ID_VIA_8235  0x3177
-#endif
-/* 8237 is undefined before kernel 2.4.21 */
-#ifndef PCI_DEVICE_ID_VIA_8237
-#define PCI_DEVICE_ID_VIA_8237  0x3227
-#endif
 static struct pci_device_id vt596_ids[] __initdata = {
         {