diff options
| author | Benjamin Herrenschmidt | 2011-11-25 05:25:39 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2011-11-25 05:25:39 +0100 |
| commit | 56368797d6c2d093bb0e7a7e5fe7b267274b6c58 (patch) | |
| tree | fc74d34be3628d31e50d3987dd372b73dd50c352 /arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | |
| parent | powerpc/mpic: Remove extra semicolon. (diff) | |
| parent | drivers/serial/ucc_uart.c: Add missing call to init UCC UART port timeout (diff) | |
| download | kernel-qcow2-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.tar.gz kernel-qcow2-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.tar.xz kernel-qcow2-linux-56368797d6c2d093bb0e7a7e5fe7b267274b6c58.zip | |
Merge remote-tracking branch 'kumar/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/p1020rdb_camp_core1.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts b/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts index 6ec02204a44e..517453821884 100644 --- a/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts +++ b/arch/powerpc/boot/dts/p1020rdb_camp_core1.dts @@ -15,7 +15,7 @@ * option) any later version. */ -/include/ "p1020si.dtsi" +/include/ "p1020rdb.dts" / { model = "fsl,P1020RDB"; @@ -28,7 +28,7 @@ cpus { PowerPC,P1020@0 { - status = "disabled"; + status = "disabled"; }; }; @@ -85,12 +85,6 @@ status = "disabled"; }; - enet0: ethernet@b0000 { - fixed-link = <1 1 1000 0 0>; - phy-connection-type = "rgmii-id"; - - }; - enet1: ethernet@b1000 { status = "disabled"; }; @@ -135,7 +129,6 @@ global-utilities@e0000 { //global utilities block status = "disabled"; }; - }; pci0: pcie@ffe09000 { |