diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-30 04:38:01 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-30 04:38:01 +0200 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /include/asm-mips/sgi/ip22.h | |
| parent | [POWERPC] remove kernel module option for booke wdt (diff) | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| download | linux-49e1900d4cc2e7bcecb681fe60f0990bec2dcce8.tar.xz linux-49e1900d4cc2e7bcecb681fe60f0990bec2dcce8.zip | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'include/asm-mips/sgi/ip22.h')
| -rw-r--r-- | include/asm-mips/sgi/ip22.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/sgi/ip22.h b/include/asm-mips/sgi/ip22.h index 6592f3bd1999..f4981c4f16bb 100644 --- a/include/asm-mips/sgi/ip22.h +++ b/include/asm-mips/sgi/ip22.h @@ -72,7 +72,7 @@ #define ip22_is_fullhouse() (sgioc->sysid & SGIOC_SYSID_FULLHOUSE) -extern unsigned short ip22_eeprom_read(volatile unsigned int *ctrl, int reg); +extern unsigned short ip22_eeprom_read(unsigned int *ctrl, int reg); extern unsigned short ip22_nvram_read(int reg); #endif |