aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-07-11 17:07:44 -0400
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-11 17:07:44 -0400
commitf193b42fa22b2ec578088e52d50d31e4a56631b7 (patch)
tree87c45a1cc8a20030553c2c3a47134bcb14f60b44 /arch/arm/configs
parent30a8a0b352141783af855948e0fcf463330736ce (diff)
parentec29174ad2069d6768a7229eab0453e7b7343abe (diff)
Merge branch 'renesas-kzm9g' into renesas-board
* renesas-kzm9g: ARM: shmobile: kzm9g: defconfig enable INOTIFY_USER ARM: mach-shmobile: add SDHI2 to the 2.8V fixed regulator consumers on kzm9g ARM: mach-shmobile: add fixed voltage regulators to kzm9g ARM: shmobile: kzm9g: enable DMAEngine on MMCIF ARM: shmobile: kzm9g: enable DMAEngine on FSI ARM: shmobile: kzm9g: enable MicroSD ARM: shmobile: kzm9g: enable USB function
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/kzm9g_defconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index 686129f3a937..2388c8610627 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -100,7 +100,12 @@ CONFIG_SND_SOC_SH4_FSI=y
100CONFIG_USB=y 100CONFIG_USB=y
101CONFIG_USB_DEVICEFS=y 101CONFIG_USB_DEVICEFS=y
102CONFIG_USB_R8A66597_HCD=y 102CONFIG_USB_R8A66597_HCD=y
103CONFIG_USB_RENESAS_USBHS=y
103CONFIG_USB_STORAGE=y 104CONFIG_USB_STORAGE=y
105CONFIG_USB_GADGET=y
106CONFIG_USB_RENESAS_USBHS_UDC=y
107CONFIG_USB_ETH=m
108CONFIG_USB_MASS_STORAGE=m
104CONFIG_MMC=y 109CONFIG_MMC=y
105# CONFIG_MMC_BLOCK_BOUNCE is not set 110# CONFIG_MMC_BLOCK_BOUNCE is not set
106CONFIG_MMC_SDHI=y 111CONFIG_MMC_SDHI=y
@@ -114,7 +119,7 @@ CONFIG_SH_DMAE=y
114CONFIG_ASYNC_TX_DMA=y 119CONFIG_ASYNC_TX_DMA=y
115CONFIG_STAGING=y 120CONFIG_STAGING=y
116# CONFIG_DNOTIFY is not set 121# CONFIG_DNOTIFY is not set
117# CONFIG_INOTIFY_USER is not set 122CONFIG_INOTIFY_USER=y
118CONFIG_VFAT_FS=y 123CONFIG_VFAT_FS=y
119CONFIG_TMPFS=y 124CONFIG_TMPFS=y
120# CONFIG_MISC_FILESYSTEMS is not set 125# CONFIG_MISC_FILESYSTEMS is not set