diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-18 13:23:30 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-18 13:23:30 +1100 |
| commit | 3b7faeb49e7c35db857b595c389436994ab1275e (patch) | |
| tree | 973208eb935876ebed9f2baf262ed08351764752 /arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | |
| parent | 82a0a1cc8f94bc59e5919715bc03fc8353fa770d (diff) | |
| parent | 96a8bac5895a41b0fb05a6aa7c3fa1ea631a91fe (diff) | |
Merge commit 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts b/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts index fd462efa9e6..15d9e35eb58 100644 --- a/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts +++ b/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts @@ -6,7 +6,7 @@ * This dts file allows core0 to have memory, l2, i2c, dma1, global-util, eth0, * eth1, crypto, pci0, pci1. * - * Copyright 2007, 2008 Freescale Semiconductor Inc. + * Copyright 2007-2009 Freescale Semiconductor Inc. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -376,7 +376,7 @@ 0x1000000 0x0 0x0 0x1000000 0x0 0x0 - 0x0 0x100000>; + 0x0 0x10000>; uli1575@0 { reg = <0x0 0x0 0x0 0x0 0x0>; #size-cells = <2>; @@ -387,7 +387,7 @@ 0x1000000 0x0 0x0 0x1000000 0x0 0x0 - 0x0 0x100000>; + 0x0 0x10000>; isa@1e { device_type = "isa"; #interrupt-cells = <2>; @@ -477,7 +477,7 @@ 0x1000000 0x0 0x0 0x1000000 0x0 0x0 - 0x0 0x100000>; + 0x0 0x10000>; }; }; }; |