diff options
author | Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> | 2006-07-25 10:24:47 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-09-27 08:37:04 -0400 |
commit | 53a73347faa38d3e80b46fc3c1999ee6bfbadbef (patch) | |
tree | 9fdbfb758448e4b16dd91b2aa063f9541a49b371 | |
parent | d4fd1989ea142be620978dcac2e1b86929f3237a (diff) |
[MIPS] Update e55 defconfig
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/configs/e55_defconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index fa2996bb4b7c..d9a0d0eb0683 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.18-rc1 | 3 | # Linux kernel version: 2.6.18-rc2 |
4 | # Thu Jul 6 10:04:02 2006 | 4 | # Tue Jul 25 23:15:03 2006 |
5 | # | 5 | # |
6 | CONFIG_MIPS=y | 6 | CONFIG_MIPS=y |
7 | 7 | ||
@@ -227,7 +227,6 @@ CONFIG_MMU=y | |||
227 | # | 227 | # |
228 | # PCCARD (PCMCIA/CardBus) support | 228 | # PCCARD (PCMCIA/CardBus) support |
229 | # | 229 | # |
230 | # CONFIG_PCCARD is not set | ||
231 | 230 | ||
232 | # | 231 | # |
233 | # PCI Hotplug Support | 232 | # PCI Hotplug Support |
@@ -254,7 +253,6 @@ CONFIG_TRAD_SIGNALS=y | |||
254 | # | 253 | # |
255 | CONFIG_STANDALONE=y | 254 | CONFIG_STANDALONE=y |
256 | CONFIG_PREVENT_FIRMWARE_BUILD=y | 255 | CONFIG_PREVENT_FIRMWARE_BUILD=y |
257 | # CONFIG_FW_LOADER is not set | ||
258 | # CONFIG_SYS_HYPERVISOR is not set | 256 | # CONFIG_SYS_HYPERVISOR is not set |
259 | 257 | ||
260 | # | 258 | # |
@@ -284,6 +282,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y | |||
284 | CONFIG_BLK_DEV_RAM=m | 282 | CONFIG_BLK_DEV_RAM=m |
285 | CONFIG_BLK_DEV_RAM_COUNT=16 | 283 | CONFIG_BLK_DEV_RAM_COUNT=16 |
286 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 284 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
285 | CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 | ||
287 | # CONFIG_BLK_DEV_INITRD is not set | 286 | # CONFIG_BLK_DEV_INITRD is not set |
288 | # CONFIG_CDROM_PKTCDVD is not set | 287 | # CONFIG_CDROM_PKTCDVD is not set |
289 | 288 | ||
@@ -643,6 +642,7 @@ CONFIG_MSDOS_PARTITION=y | |||
643 | # | 642 | # |
644 | # Kernel hacking | 643 | # Kernel hacking |
645 | # | 644 | # |
645 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | ||
646 | # CONFIG_PRINTK_TIME is not set | 646 | # CONFIG_PRINTK_TIME is not set |
647 | # CONFIG_MAGIC_SYSRQ is not set | 647 | # CONFIG_MAGIC_SYSRQ is not set |
648 | # CONFIG_UNUSED_SYMBOLS is not set | 648 | # CONFIG_UNUSED_SYMBOLS is not set |
@@ -650,7 +650,7 @@ CONFIG_MSDOS_PARTITION=y | |||
650 | CONFIG_LOG_BUF_SHIFT=14 | 650 | CONFIG_LOG_BUF_SHIFT=14 |
651 | # CONFIG_DEBUG_FS is not set | 651 | # CONFIG_DEBUG_FS is not set |
652 | CONFIG_CROSSCOMPILE=y | 652 | CONFIG_CROSSCOMPILE=y |
653 | CONFIG_CMDLINE="console=ttyVR0,19200 mem=8M" | 653 | CONFIG_CMDLINE="console=ttyVR0,19200 ide0=0x1f0,0x3f6,40 mem=8M" |
654 | 654 | ||
655 | # | 655 | # |
656 | # Security options | 656 | # Security options |