diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-20 20:41:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-20 20:41:10 -0700 |
| commit | f89168fe22d437521ed02f93c5fb1347a8cc4306 (patch) | |
| tree | 409bf330180a075f5946ce67ee677834a76b7b13 /include/linux | |
| parent | ec9fc417f091337fdc5ba4d0059dff0bf58b9a27 (diff) | |
| parent | b6b44ebfa139b5de44257388a64b016860b3ec84 (diff) | |
Merge bk://kernel.bkbits.net/jgarzik/net-drivers-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/eeprom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/eeprom.h b/include/linux/eeprom.h index 0f0642271857..ddd37b8ce903 100644 --- a/include/linux/eeprom.h +++ b/include/linux/eeprom.h @@ -59,7 +59,7 @@ void setup_ee_mem_bitbanger(struct eeprom *ee, long memaddr, int eesel_bit, int /* foo. put this in a .c file */ static inline void eeprom_update(struct eeprom *ee, u32 mask, int pol) { - long flags; + unsigned long flags; u32 data; spin_lock_irqsave(ee->lock, flags); |