Changeset 566

Show
Ignore:
Timestamp:
09/16/99 21:47:46 (14 years ago)
Author:
frodo
Message:

PCI fixes for kernel 2.3.13 and later. Typo fixed in thmc50 which

bit the compiler.

Location:
lm-sensors/trunk/kernel
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • lm-sensors/trunk/kernel/busses/i2c-hydra.c

    r516 r566  
    156156                return -ENODEV; 
    157157                 
    158 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54)) 
     158#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54) 
    159159        dev = pci_find_device(VENDOR, DEVICE, NULL); 
    160160        if (!dev) { 
    … …  
    168168 
    169169 
    170 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54)) 
     170#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,13) 
     171        base_addr = dev->resource[0].start; 
     172#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54)) 
    171173        base_addr = dev->base_address[0]; 
    172174#else 

  • lm-sensors/trunk/kernel/busses/i2c-voodoo3.c

    r516 r566  
    419419 
    420420        /* map Voodoo3 memory */ 
    421 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54)) 
     421#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,13) 
     422        cadr = dev->resource[0].start; 
     423#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,54) 
    422424        cadr = dev->base_address[0]; 
    423425#else 

  • lm-sensors/trunk/kernel/chips/thmc50.c

    r564 r566  
    192192 
    193193#ifdef DEBUG 
    194    printk("thmc50.o: Probing for THMC50 at 0x%2.X on bus %d\n",address,adapter->id); 
     194   printk("thmc50.o: Probing for THMC50 at 0x%2X on bus %d\n",address,adapter->id); 
    195195#endif 
    196196