Changeset 4542

Show
Ignore:
Timestamp:
07/03/07 15:09:56 (1 year ago)
Author:
khali
Message:

Don't redefine vid_from_reg().

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r4327 r4542  
    263263#define DAC_TO_REG(val) (SENSORS_LIMIT(val,0,255)) 
    264264#define DAC_FROM_REG(val) (val) 
    265  
    266 /* sensors_vid.h defines vid_from_reg() */ 
    267 #define VID_FROM_REG(val,vrm) (vid_from_reg(val,vrm)) 
    268265 
    269266#define ALARMS_FROM_REG(val) (val) 
    …… 
    15571554        else if (operation == SENSORS_PROC_REAL_READ) { 
    15581555                adm1026_update_client(client); 
    1559                 results[0] = VID_FROM_REG((data->vid)&0x3f,data->vrm); 
     1556                results[0] = vid_from_reg((data->vid)&0x3f,data->vrm); 
    15601557                *nrels_mag = 1; 
    15611558        } else if (operation == SENSORS_PROC_REAL_WRITE) {