diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 22:33:08 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 22:33:08 +0300 |
commit | e5d45abe1487aa856e48d6d9b857bd200b63b896 (patch) | |
tree | ce35d4a059a580949036dbb28b58401afad64cf9 /arch/powerpc/boot/dts/mpc8377_wlan.dts | |
parent | 749f3cbe1acd60a7bf6ff0396a48a28705096305 (diff) | |
parent | f56ab498db55f1b7f5219aa5c7a04d562392cbb8 (diff) | |
download | linux-e5d45abe1487aa856e48d6d9b857bd200b63b896.tar.xz |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: pasemi_defconfig update
powerpc: 2.6.32 update of defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx
powerpc/8xxx: enable IPsec ESP by default on mpc83xx/mpc85xx
powerpc/83xx: Fix u-boot partion size for MPC8377E-WLAN boards
powerpc/85xx: Fix USB GPIOs for MPC8569E-MDS boards
powerpc/82xx: kmalloc failure ignored in ep8248e_mdio_probe()
powerpc/85xx: sbc8548 - fixup of PCI-e related DTS fields
Diffstat (limited to 'arch/powerpc/boot/dts/mpc8377_wlan.dts')
-rw-r--r-- | arch/powerpc/boot/dts/mpc8377_wlan.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/mpc8377_wlan.dts b/arch/powerpc/boot/dts/mpc8377_wlan.dts index 9a603695723b..9ea783056969 100644 --- a/arch/powerpc/boot/dts/mpc8377_wlan.dts +++ b/arch/powerpc/boot/dts/mpc8377_wlan.dts @@ -67,7 +67,7 @@ device-width = <1>; partition@0 { - reg = <0 0x8000>; + reg = <0 0x80000>; label = "u-boot"; read-only; }; |