diff options
author | Olof Johansson | 2012-09-05 06:41:35 +0200 |
---|---|---|
committer | Olof Johansson | 2012-09-05 06:41:35 +0200 |
commit | f81a3a1f687a4a90025822dd54e51d7117a6cba7 (patch) | |
tree | 5871e5a0582bbe4161f469e4e73f6f75655e8cbd /arch/arm/configs | |
parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/r... (diff) | |
parent | ARM: shmobile: armadillo800eva: enable rw rootfs mount (diff) | |
download | kernel-qcow2-linux-f81a3a1f687a4a90025822dd54e51d7117a6cba7.tar.gz kernel-qcow2-linux-f81a3a1f687a4a90025822dd54e51d7117a6cba7.tar.xz kernel-qcow2-linux-f81a3a1f687a4a90025822dd54e51d7117a6cba7.zip |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Two regression fixes and one boot-loader compatibility fix from Simon Horman.
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: armadillo800eva: enable rw rootfs mount
ARM: shmobile: mackerel: fixup usb module order
ARM: shmobile: armadillo800eva: fixup: sound card detection order
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 7d8718468e0d..90610c7030f7 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -33,7 +33,7 @@ CONFIG_AEABI=y CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096" +CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw" CONFIG_CMDLINE_FORCE=y CONFIG_KEXEC=y CONFIG_VFP=y |