diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 17:07:44 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 17:07:44 -0400 |
commit | f193b42fa22b2ec578088e52d50d31e4a56631b7 (patch) | |
tree | 87c45a1cc8a20030553c2c3a47134bcb14f60b44 /arch/arm/configs | |
parent | 30a8a0b352141783af855948e0fcf463330736ce (diff) | |
parent | ec29174ad2069d6768a7229eab0453e7b7343abe (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_defconfig | 7 |
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 | |||
100 | CONFIG_USB=y | 100 | CONFIG_USB=y |
101 | CONFIG_USB_DEVICEFS=y | 101 | CONFIG_USB_DEVICEFS=y |
102 | CONFIG_USB_R8A66597_HCD=y | 102 | CONFIG_USB_R8A66597_HCD=y |
103 | CONFIG_USB_RENESAS_USBHS=y | ||
103 | CONFIG_USB_STORAGE=y | 104 | CONFIG_USB_STORAGE=y |
105 | CONFIG_USB_GADGET=y | ||
106 | CONFIG_USB_RENESAS_USBHS_UDC=y | ||
107 | CONFIG_USB_ETH=m | ||
108 | CONFIG_USB_MASS_STORAGE=m | ||
104 | CONFIG_MMC=y | 109 | CONFIG_MMC=y |
105 | # CONFIG_MMC_BLOCK_BOUNCE is not set | 110 | # CONFIG_MMC_BLOCK_BOUNCE is not set |
106 | CONFIG_MMC_SDHI=y | 111 | CONFIG_MMC_SDHI=y |
@@ -114,7 +119,7 @@ CONFIG_SH_DMAE=y | |||
114 | CONFIG_ASYNC_TX_DMA=y | 119 | CONFIG_ASYNC_TX_DMA=y |
115 | CONFIG_STAGING=y | 120 | CONFIG_STAGING=y |
116 | # CONFIG_DNOTIFY is not set | 121 | # CONFIG_DNOTIFY is not set |
117 | # CONFIG_INOTIFY_USER is not set | 122 | CONFIG_INOTIFY_USER=y |
118 | CONFIG_VFAT_FS=y | 123 | CONFIG_VFAT_FS=y |
119 | CONFIG_TMPFS=y | 124 | CONFIG_TMPFS=y |
120 | # CONFIG_MISC_FILESYSTEMS is not set | 125 | # CONFIG_MISC_FILESYSTEMS is not set |