diff options
| author | Jeff Kirsher | 2006-11-01 17:48:02 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2006-12-02 06:12:00 +0100 |
| commit | 2df7d59f287236a636fb2d7e05879e65c8c56492 (patch) | |
| tree | bee33ba966c6a961799494dc655adb1b36e3d6b6 /drivers/net/e1000/e1000_osdep.h | |
| parent | e1000: add queue restart counter (diff) | |
| download | kernel-qcow2-linux-2df7d59f287236a636fb2d7e05879e65c8c56492.tar.gz kernel-qcow2-linux-2df7d59f287236a636fb2d7e05879e65c8c56492.tar.xz kernel-qcow2-linux-2df7d59f287236a636fb2d7e05879e65c8c56492.zip | |
e1000: rename ICH8 flash macros
ICH8 will soon be followed by newer chipsets bearing the same acronym,
thus we remove the '8' and make it independent of the version number in
the platform name.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Diffstat (limited to 'drivers/net/e1000/e1000_osdep.h')
| -rw-r--r-- | drivers/net/e1000/e1000_osdep.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/e1000/e1000_osdep.h b/drivers/net/e1000/e1000_osdep.h index 3b7eb7c20019..18afc0c25dac 100644 --- a/drivers/net/e1000/e1000_osdep.h +++ b/drivers/net/e1000/e1000_osdep.h @@ -107,16 +107,16 @@ typedef enum { #define E1000_WRITE_FLUSH(a) E1000_READ_REG(a, STATUS) -#define E1000_WRITE_ICH8_REG(a, reg, value) ( \ +#define E1000_WRITE_ICH_FLASH_REG(a, reg, value) ( \ writel((value), ((a)->flash_address + reg))) -#define E1000_READ_ICH8_REG(a, reg) ( \ +#define E1000_READ_ICH_FLASH_REG(a, reg) ( \ readl((a)->flash_address + reg)) -#define E1000_WRITE_ICH8_REG16(a, reg, value) ( \ +#define E1000_WRITE_ICH_FLASH_REG16(a, reg, value) ( \ writew((value), ((a)->flash_address + reg))) -#define E1000_READ_ICH8_REG16(a, reg) ( \ +#define E1000_READ_ICH_FLASH_REG16(a, reg) ( \ readw((a)->flash_address + reg)) #endif /* _E1000_OSDEP_H_ */ |