Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...

[pandora-kernel.git] / arch / powerpc / boot / dts / p1010rdb.dts

diff --git a/arch/powerpc/boot/dts/p1010rdb.dts b/arch/powerpc/boot/dts/p1010rdb.dts
index 6b33b73..d6c669c 100644 (file)
--- a/arch/powerpc/boot/dts/p1010rdb.dts
+++ b/arch/powerpc/boot/dts/p1010rdb.dts
@@ -23,6 +23,8 @@
                ethernet2 = &enet2;
                pci0 = &pci0;
                pci1 = &pci1;
+               can0 = &can0;
+               can1 = &can1;
        };
 
        memory {
@@ -169,14 +171,6 @@
                        };
                };
 
-               can0@1c000 {
-                       fsl,flexcan-clock-source = "platform";
-               };
-
-               can1@1d000 {
-                       fsl,flexcan-clock-source = "platform";
-               };
-
                usb@22000 {
                        phy_type = "utmi";
                };