Merge branch 'akpm' (incoming from Andrew)

[~andy/linux] / arch / arm / boot / dts / sun4i-a10-hackberry.dts

diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index b3ae51fa9372328f7fc9c7dee5eb577536f87bdb..3a1595f67823c1999f2ea4c1929ed66fd46fe055 100644 (file)
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -18,10 +18,6 @@
        model = "Miniand Hackberry";
        compatible = "miniand,hackberry", "allwinner,sun4i-a10";
 
-       chosen {
-               bootargs = "earlyprintk console=ttyS0,115200";
-       };
-
        soc@01c00000 {
                emac: ethernet@01c0b000 {
                        pinctrl-names = "default";