@@ -5,7 +5,6 @@ CONFIG_ATAGS=y
CONFIG_ATAGS_PROC=y
CONFIG_KUSER_HELPERS=y
CONFIG_ARCH_MULTI_V6=y
-CONFIG_ARCH_BCM2835=y
CONFIG_ARCH_BCM2708=y
CONFIG_MACH_BCM2708=y
CONFIG_BCM2708_VCMEM=y
@@ -13,4 +12,4 @@ CONFIG_BCM2708_DMAER=y
CONFIG_BCM2708_VCHIQ=y
CONFIG_SERIAL_AMBA_PL011=y
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
-CONFIG_CMDLINE_EXTEND=y
+CONFIG_CMDLINE_FROM_BOOTLOADER=y
Waldemar Brodkorb