mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-08 16:11:26 +00:00
PCI fixes for kernel 2.3.13 and later. Typo fixed in thmc50 which
bit the compiler. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@566 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
a6b2aed00b
commit
1b41975d9a
3 files changed
+8
-4
No files matched your search
@@ -155,7 +155,7 @@ static int find_hydra(void)
|
||||
if (!pci_present())
|
||||
return -ENODEV;
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54))
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54)
|
||||
dev = pci_find_device(VENDOR, DEVICE, NULL);
|
||||
if (!dev) {
|
||||
#else
|
||||
@@ -167,7 +167,9 @@ static int find_hydra(void)
|
||||
}
|
||||
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54))
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,13)
|
||||
base_addr = dev->resource[0].start;
|
||||
#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54))
|
||||
base_addr = dev->base_address[0];
|
||||
#else
|
||||
pcibios_read_config_dword(bus, devfn,PCI_BASE_ADDRESS_0,&base_addr);
|
||||
|
||||
@@ -418,7 +418,9 @@ void config_v3(struct pci_dev *dev, int num)
|
||||
unsigned int cadr;
|
||||
|
||||
/* map Voodoo3 memory */
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54))
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,13)
|
||||
cadr = dev->resource[0].start;
|
||||
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54)
|
||||
cadr = dev->base_address[0];
|
||||
#else
|
||||
pcibios_read_config_dword(dev->bus->number, dev->devfn,
|
||||
|
||||
@@ -191,7 +191,7 @@ int thmc50_detect(struct i2c_adapter *adapter, int address, int kind)
|
||||
const char *type_name,*client_name;
|
||||
|
||||
#ifdef DEBUG
|
||||
printk("thmc50.o: Probing for THMC50 at 0x%2.X on bus %d\n",address,adapter->id);
|
||||
printk("thmc50.o: Probing for THMC50 at 0x%2X on bus %d\n",address,adapter->id);
|
||||
#endif
|
||||
|
||||
/* Make sure we aren't probing the ISA bus!! This is just a safety check
|
||||
|
||||
Reference in new issue
Block a user