summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-07-16 10:08:33 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-16 10:08:33 (GMT)
commite910b63d009701ad4ebbeb089aba35707fa5d68e (patch)
treef7fdd3c2b1d9165d69a778c434e664f8789f4401 /arch/arm/configs
parent2f7989efd4398d92b8adffce2e07dd043a0895fe (diff)
parentc9c6fe5033191d82e1d819105485c795062107fd (diff)
downloadlinux-e910b63d009701ad4ebbeb089aba35707fa5d68e.tar.xz
Merge branch 'l7200' into devel
Conflicts: arch/arm/configs/lusl7200_defconfig
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/lusl7200_defconfig23
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/arm/configs/lusl7200_defconfig b/arch/arm/configs/lusl7200_defconfig
deleted file mode 100644
index 816fc42..0000000
--- a/arch/arm/configs/lusl7200_defconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EMBEDDED=y
-# CONFIG_HOTPLUG is not set
-CONFIG_MODULES=y
-CONFIG_ARCH_L7200=y
-# CONFIG_ARM_THUMB is not set
-CONFIG_ZBOOT_ROM_TEXT=0x00010000
-CONFIG_ZBOOT_ROM_BSS=0xf03e0000
-CONFIG_ZBOOT_ROM=y
-CONFIG_CMDLINE="console=tty0 console=ttyLU1,115200 root=/dev/ram initrd=0xf1000000,0x005dac7b mem=32M"
-CONFIG_BINFMT_AOUT=y
-CONFIG_BLK_DEV_RAM=y
-# CONFIG_INPUT is not set
-# CONFIG_SERIO_SERPORT is not set
-# CONFIG_VT is not set
-CONFIG_SERIAL_NONSTANDARD=y
-CONFIG_EXT2_FS=y
-CONFIG_DEBUG_USER=y
-# CONFIG_CRC32 is not set