summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-07-11 23:07:44 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-07-11 23:07:44 +0200
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
CONFIG_USB=y
CONFIG_USB_DEVICEFS=y
CONFIG_USB_R8A66597_HCD=y
+CONFIG_USB_RENESAS_USBHS=y
CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_RENESAS_USBHS_UDC=y
+CONFIG_USB_ETH=m
+CONFIG_USB_MASS_STORAGE=m
CONFIG_MMC=y
# CONFIG_MMC_BLOCK_BOUNCE is not set
CONFIG_MMC_SDHI=y
@@ -114,7 +119,7 @@ CONFIG_SH_DMAE=y
CONFIG_ASYNC_TX_DMA=y
CONFIG_STAGING=y
# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
+CONFIG_INOTIFY_USER=y
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
# CONFIG_MISC_FILESYSTEMS is not set