diff options
| -rw-r--r-- | arch/arm/configs/omap3_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/omap3_defconfig b/arch/arm/configs/omap3_defconfig index 01e5986bb48e..d2ab4928db57 100644 --- a/arch/arm/configs/omap3_defconfig +++ b/arch/arm/configs/omap3_defconfig | |||
| @@ -391,7 +391,7 @@ CONFIG_ALIGNMENT_TRAP=y | |||
| 391 | # | 391 | # |
| 392 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 392 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
| 393 | CONFIG_ZBOOT_ROM_BSS=0x0 | 393 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 394 | CONFIG_CMDLINE="root=/dev/nfs nfsroot=192.168.0.1:/home/user/buildroot ip=192.168.0.2:192.168.0.1:192.168.0.1:255.255.255.0:tgt:eth0:off rw console=ttyS2,115200n8" | 394 | CONFIG_CMDLINE="root=/dev/mmcblk0p2 rootwait console=ttyS2,115200" |
| 395 | # CONFIG_XIP_KERNEL is not set | 395 | # CONFIG_XIP_KERNEL is not set |
| 396 | CONFIG_KEXEC=y | 396 | CONFIG_KEXEC=y |
| 397 | CONFIG_ATAGS_PROC=y | 397 | CONFIG_ATAGS_PROC=y |
| @@ -1687,7 +1687,7 @@ CONFIG_SDIO_UART=y | |||
| 1687 | # MMC/SD/SDIO Host Controller Drivers | 1687 | # MMC/SD/SDIO Host Controller Drivers |
| 1688 | # | 1688 | # |
| 1689 | # CONFIG_MMC_SDHCI is not set | 1689 | # CONFIG_MMC_SDHCI is not set |
| 1690 | # CONFIG_MMC_OMAP is not set | 1690 | CONFIG_MMC_OMAP=y |
| 1691 | CONFIG_MMC_OMAP_HS=y | 1691 | CONFIG_MMC_OMAP_HS=y |
| 1692 | # CONFIG_MMC_AT91 is not set | 1692 | # CONFIG_MMC_AT91 is not set |
| 1693 | # CONFIG_MMC_ATMELMCI is not set | 1693 | # CONFIG_MMC_ATMELMCI is not set |