diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-05 06:41:35 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-05 06:41:35 +0200 |
| commit | f81a3a1f687a4a90025822dd54e51d7117a6cba7 (patch) | |
| tree | 5871e5a0582bbe4161f469e4e73f6f75655e8cbd /arch/arm/mach-shmobile/board-armadillo800eva.c | |
| 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 | linux-f81a3a1f687a4a90025822dd54e51d7117a6cba7.tar.xz 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/mach-shmobile/board-armadillo800eva.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-armadillo800eva.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index 65cb7936ed9e..453a6e50db8b 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -902,8 +902,8 @@ static struct platform_device *eva_devices[] __initdata = { &camera_device, &ceu0_device, &fsi_device, - &fsi_hdmi_device, &fsi_wm8978_device, + &fsi_hdmi_device, }; static void __init eva_clock_init(void) |