diff options
| author | Mark A. Greer <mgreer@mvista.com> | 2005-09-03 18:55:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:00 -0400 |
| commit | d01c08c9ae91c1526d4564b400b3e0e04b49d1ba (patch) | |
| tree | a1cc06a5342fdaf6185d2655a636cc181d56cb08 /include/linux | |
| parent | bbde630b553d349307fe719486bc06f8cf9c1a2d (diff) | |
[PATCH] ppc32: mv64x60 updates & enhancements
Updates and enhancement to the ppc32 mv64x60 code:
- move code to get mem size from mem ctlr to bootwrapper
- address some errata in the mv64360 pic code
- some minor cleanups
- export one of the bridge's regs via sysfs so user daemon can watch for
extraction events
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mv643xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mv643xx.h b/include/linux/mv643xx.h index 5773ea42f6e4..0b08cd692201 100644 --- a/include/linux/mv643xx.h +++ b/include/linux/mv643xx.h | |||
| @@ -980,7 +980,7 @@ | |||
| 980 | /* I2C Registers */ | 980 | /* I2C Registers */ |
| 981 | /****************************************/ | 981 | /****************************************/ |
| 982 | 982 | ||
| 983 | #define MV64XXX_I2C_CTLR_NAME "mv64xxx i2c" | 983 | #define MV64XXX_I2C_CTLR_NAME "mv64xxx_i2c" |
| 984 | #define MV64XXX_I2C_OFFSET 0xc000 | 984 | #define MV64XXX_I2C_OFFSET 0xc000 |
| 985 | #define MV64XXX_I2C_REG_BLOCK_SIZE 0x0020 | 985 | #define MV64XXX_I2C_REG_BLOCK_SIZE 0x0020 |
| 986 | 986 | ||