diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-21 09:30:45 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-21 09:30:45 +1100 |
| commit | 8beac08ee906870b27160fab262975577d3e4338 (patch) | |
| tree | 58a19d4bf65f057c9a32f6231cd96b36232f39b8 /arch/powerpc/boot/dts/warp.dts | |
| parent | 2593f939a5fa7564ba5be0fd5aec4bb1162bd4b2 (diff) | |
| parent | a18cb387e5c29be5c95cded5b5a55110bb930f5c (diff) | |
Merge commit 'jwb/next' into merge
Diffstat (limited to 'arch/powerpc/boot/dts/warp.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/warp.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts index 31605ee4afb..e576ee85c42 100644 --- a/arch/powerpc/boot/dts/warp.dts +++ b/arch/powerpc/boot/dts/warp.dts @@ -146,7 +146,7 @@ fpga@2,4000 { compatible = "pika,fpga-sd"; - reg = <0x00000002 0x00004000 0x00000A00>; + reg = <0x00000002 0x00004000 0x00004000>; }; nor@0,0 { |