adm5120: add support for 3.6

[oweals/openwrt.git] / target / linux / adm5120 / config-3.3

diff --git a/target/linux/adm5120/config-3.3 b/target/linux/adm5120/config-3.3
index 64b2efa66245b1589e1254a3ee3847d05cf4fb16..a136a9cd34ef56082ac10023dfbfd62ba62faa10 100644 (file)
--- a/target/linux/adm5120/config-3.3
+++ b/target/linux/adm5120/config-3.3
@@ -43,7 +43,7 @@ CONFIG_ATA=m
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_CEVT_R4K=y
 CONFIG_CEVT_R4K_LIB=y
-CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2"
+CONFIG_CMDLINE="console=ttyAM0,115200 rootfstype=squashfs,jffs2"
 CONFIG_CMDLINE_BOOL=y
 # CONFIG_CMDLINE_OVERRIDE is not set
 # CONFIG_CPU_BIG_ENDIAN is not set
@@ -167,7 +167,6 @@ CONFIG_SCSI_MOD=m
 CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL010_NUMPORTS=2
-CONFIG_SERIAL_AMBA_PL010_PORTNAME="ttyS"
 # CONFIG_SERIAL_AMBA_PL011 is not set
 CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=y
@@ -184,9 +183,11 @@ CONFIG_USB_ADM5120_HCD=m
 CONFIG_USB_ARCH_HAS_XHCI=y
 CONFIG_USB_COMMON=m
 CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 CONFIG_ZONE_DMA_FLAG=0