diff options
| author |   James Morris <jmorris@namei.org> | 2010-01-18 09:56:22 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-18 09:56:22 +1100 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /arch/powerpc/boot/dts/gef_ppc9a.dts | |
| parent | selinux: change the handling of unknown classes (diff) | |
| parent | page allocator: update NR_FREE_PAGES only when necessary (diff) | |
| download | linux-dev-2457552d1e6f3183cd93f81c49a8da5fe8bb0e42.tar.xz linux-dev-2457552d1e6f3183cd93f81c49a8da5fe8bb0e42.zip | |
Merge branch 'master' into next
Diffstat (limited to 'arch/powerpc/boot/dts/gef_ppc9a.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/gef_ppc9a.dts | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/gef_ppc9a.dts b/arch/powerpc/boot/dts/gef_ppc9a.dts index 910944edd886..c86114e93f1e 100644 --- a/arch/powerpc/boot/dts/gef_ppc9a.dts +++ b/arch/powerpc/boot/dts/gef_ppc9a.dts @@ -118,6 +118,12 @@ }; }; + nvram@3,0 { + device_type = "nvram"; + compatible = "simtek,stk14ca8"; + reg = <0x3 0x0 0x20000>; + }; + fpga@4,0 { compatible = "gef,ppc9a-fpga-regs"; reg = <0x4 0x0 0x40>; |