diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /arch/powerpc/boot/dts/glacier.dts | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'arch/powerpc/boot/dts/glacier.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/glacier.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts index 24cf0dba120c..f3787a27f634 100644 --- a/arch/powerpc/boot/dts/glacier.dts +++ b/arch/powerpc/boot/dts/glacier.dts | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #address-cells = <2>; | 14 | #address-cells = <2>; |
| 15 | #size-cells = <1>; | 15 | #size-cells = <1>; |
| 16 | model = "amcc,glacier"; | 16 | model = "amcc,glacier"; |
| 17 | compatible = "amcc,glacier", "amcc,canyonlands"; | 17 | compatible = "amcc,glacier"; |
| 18 | dcr-parent = <&{/cpus/cpu@0}>; | 18 | dcr-parent = <&{/cpus/cpu@0}>; |
| 19 | 19 | ||
| 20 | aliases { | 20 | aliases { |