diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 08:36:24 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-25 08:36:24 +0900 |
| commit | 698fd6a2c3ca05ec796072defb5c415289a86cdc (patch) | |
| tree | dac9d59ed860d3d15322d63f4ad8f2dc36032600 /drivers/hwmon/i5k_amb.c | |
| parent | 8a3fbc9fdb4fd8f0970ab1a98f694ff25b7d5b47 (diff) | |
| parent | 32292f49f9683622ad0fb95a8c754910121e7b16 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
hwmon: (lis3lv02d_i2c) Fix compile warnings
hwmon: (i5k_amb) Fix compile warning
Diffstat (limited to 'drivers/hwmon/i5k_amb.c')
| -rw-r--r-- | drivers/hwmon/i5k_amb.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c index 937983407e2..c4c40be0edb 100644 --- a/drivers/hwmon/i5k_amb.c +++ b/drivers/hwmon/i5k_amb.c @@ -497,12 +497,14 @@ static unsigned long chipset_ids[] = { 0 }; +#ifdef MODULE static struct pci_device_id i5k_amb_ids[] __devinitdata = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) }, { 0, } }; MODULE_DEVICE_TABLE(pci, i5k_amb_ids); +#endif static int __devinit i5k_amb_probe(struct platform_device *pdev) { |