diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /arch/ppc/syslib/mpc83xx_devices.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'arch/ppc/syslib/mpc83xx_devices.c')
| -rw-r--r-- | arch/ppc/syslib/mpc83xx_devices.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c index 75c8e9834ae7..5aaf0e58e1f9 100644 --- a/arch/ppc/syslib/mpc83xx_devices.c +++ b/arch/ppc/syslib/mpc83xx_devices.c | |||
| @@ -191,8 +191,8 @@ struct platform_device ppc_sys_platform_devices[] = { | |||
| 191 | .num_resources = 2, | 191 | .num_resources = 2, |
| 192 | .resource = (struct resource[]) { | 192 | .resource = (struct resource[]) { |
| 193 | { | 193 | { |
| 194 | .start = 0x22000, | 194 | .start = 0x23000, |
| 195 | .end = 0x22fff, | 195 | .end = 0x23fff, |
| 196 | .flags = IORESOURCE_MEM, | 196 | .flags = IORESOURCE_MEM, |
| 197 | }, | 197 | }, |
| 198 | { | 198 | { |
| @@ -208,8 +208,8 @@ struct platform_device ppc_sys_platform_devices[] = { | |||
| 208 | .num_resources = 2, | 208 | .num_resources = 2, |
| 209 | .resource = (struct resource[]) { | 209 | .resource = (struct resource[]) { |
| 210 | { | 210 | { |
| 211 | .start = 0x23000, | 211 | .start = 0x22000, |
| 212 | .end = 0x23fff, | 212 | .end = 0x22fff, |
| 213 | .flags = IORESOURCE_MEM, | 213 | .flags = IORESOURCE_MEM, |
| 214 | }, | 214 | }, |
| 215 | { | 215 | { |