diff options
Diffstat (limited to 'arch/arm/configs/rx51_defconfig')
-rw-r--r-- | arch/arm/configs/rx51_defconfig | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig index e7e31332c62a..473f9e13f08b 100644 --- a/arch/arm/configs/rx51_defconfig +++ b/arch/arm/configs/rx51_defconfig | |||
@@ -59,8 +59,6 @@ CONFIG_FAIR_GROUP_SCHED=y | |||
59 | CONFIG_USER_SCHED=y | 59 | CONFIG_USER_SCHED=y |
60 | # CONFIG_CGROUP_SCHED is not set | 60 | # CONFIG_CGROUP_SCHED is not set |
61 | # CONFIG_CGROUPS is not set | 61 | # CONFIG_CGROUPS is not set |
62 | CONFIG_SYSFS_DEPRECATED=y | ||
63 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
64 | # CONFIG_RELAY is not set | 62 | # CONFIG_RELAY is not set |
65 | # CONFIG_NAMESPACES is not set | 63 | # CONFIG_NAMESPACES is not set |
66 | CONFIG_BLK_DEV_INITRD=y | 64 | CONFIG_BLK_DEV_INITRD=y |
@@ -212,7 +210,6 @@ CONFIG_MACH_NOKIA_RX51=y | |||
212 | # | 210 | # |
213 | # Processor Type | 211 | # Processor Type |
214 | # | 212 | # |
215 | CONFIG_CPU_32=y | ||
216 | CONFIG_CPU_32v6K=y | 213 | CONFIG_CPU_32v6K=y |
217 | CONFIG_CPU_V7=y | 214 | CONFIG_CPU_V7=y |
218 | CONFIG_CPU_32v7=y | 215 | CONFIG_CPU_32v7=y |
@@ -323,6 +320,7 @@ CONFIG_PM_SLEEP=y | |||
323 | CONFIG_SUSPEND=y | 320 | CONFIG_SUSPEND=y |
324 | CONFIG_SUSPEND_FREEZER=y | 321 | CONFIG_SUSPEND_FREEZER=y |
325 | # CONFIG_APM_EMULATION is not set | 322 | # CONFIG_APM_EMULATION is not set |
323 | CONFIG_PM_RUNTIME=y | ||
326 | CONFIG_ARCH_SUSPEND_POSSIBLE=y | 324 | CONFIG_ARCH_SUSPEND_POSSIBLE=y |
327 | CONFIG_NET=y | 325 | CONFIG_NET=y |
328 | 326 | ||
@@ -446,6 +444,8 @@ CONFIG_IP_NF_FILTER=m | |||
446 | # CONFIG_LAPB is not set | 444 | # CONFIG_LAPB is not set |
447 | # CONFIG_ECONET is not set | 445 | # CONFIG_ECONET is not set |
448 | # CONFIG_WAN_ROUTER is not set | 446 | # CONFIG_WAN_ROUTER is not set |
447 | CONFIG_PHONET=y | ||
448 | # CONFIG_IEEE802154 is not set | ||
449 | # CONFIG_NET_SCHED is not set | 449 | # CONFIG_NET_SCHED is not set |
450 | # CONFIG_DCB is not set | 450 | # CONFIG_DCB is not set |
451 | 451 | ||
@@ -478,7 +478,6 @@ CONFIG_BT_HIDP=m | |||
478 | # CONFIG_BT_HCIBFUSB is not set | 478 | # CONFIG_BT_HCIBFUSB is not set |
479 | # CONFIG_BT_HCIVHCI is not set | 479 | # CONFIG_BT_HCIVHCI is not set |
480 | # CONFIG_AF_RXRPC is not set | 480 | # CONFIG_AF_RXRPC is not set |
481 | # CONFIG_PHONET is not set | ||
482 | CONFIG_WIRELESS=y | 481 | CONFIG_WIRELESS=y |
483 | CONFIG_CFG80211=y | 482 | CONFIG_CFG80211=y |
484 | # CONFIG_CFG80211_REG_DEBUG is not set | 483 | # CONFIG_CFG80211_REG_DEBUG is not set |
@@ -784,7 +783,7 @@ CONFIG_INPUT_KEYBOARD=y | |||
784 | # CONFIG_KEYBOARD_XTKBD is not set | 783 | # CONFIG_KEYBOARD_XTKBD is not set |
785 | # CONFIG_KEYBOARD_NEWTON is not set | 784 | # CONFIG_KEYBOARD_NEWTON is not set |
786 | # CONFIG_KEYBOARD_STOWAWAY is not set | 785 | # CONFIG_KEYBOARD_STOWAWAY is not set |
787 | # CONFIG_KEYBOARD_GPIO is not set | 786 | CONFIG_KEYBOARD_GPIO=m |
788 | # CONFIG_INPUT_MOUSE is not set | 787 | # CONFIG_INPUT_MOUSE is not set |
789 | # CONFIG_INPUT_JOYSTICK is not set | 788 | # CONFIG_INPUT_JOYSTICK is not set |
790 | # CONFIG_INPUT_TABLET is not set | 789 | # CONFIG_INPUT_TABLET is not set |
@@ -1326,27 +1325,34 @@ CONFIG_USB_GADGET_SELECTED=y | |||
1326 | # CONFIG_USB_GADGET_LH7A40X is not set | 1325 | # CONFIG_USB_GADGET_LH7A40X is not set |
1327 | # CONFIG_USB_GADGET_OMAP is not set | 1326 | # CONFIG_USB_GADGET_OMAP is not set |
1328 | # CONFIG_USB_GADGET_PXA25X is not set | 1327 | # CONFIG_USB_GADGET_PXA25X is not set |
1328 | # CONFIG_USB_GADGET_R8A66597 is not set | ||
1329 | # CONFIG_USB_GADGET_PXA27X is not set | 1329 | # CONFIG_USB_GADGET_PXA27X is not set |
1330 | # CONFIG_USB_GADGET_S3C2410 is not set | 1330 | # CONFIG_USB_GADGET_S3C_HSOTG is not set |
1331 | # CONFIG_USB_GADGET_IMX is not set | 1331 | # CONFIG_USB_GADGET_IMX is not set |
1332 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
1332 | # CONFIG_USB_GADGET_M66592 is not set | 1333 | # CONFIG_USB_GADGET_M66592 is not set |
1333 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 1334 | # CONFIG_USB_GADGET_AMD5536UDC is not set |
1334 | # CONFIG_USB_GADGET_FSL_QE is not set | 1335 | # CONFIG_USB_GADGET_FSL_QE is not set |
1335 | # CONFIG_USB_GADGET_CI13XXX is not set | 1336 | # CONFIG_USB_GADGET_CI13XXX is not set |
1336 | # CONFIG_USB_GADGET_NET2280 is not set | 1337 | # CONFIG_USB_GADGET_NET2280 is not set |
1337 | # CONFIG_USB_GADGET_GOKU is not set | 1338 | # CONFIG_USB_GADGET_GOKU is not set |
1339 | # CONFIG_USB_GADGET_LANGWELL is not set | ||
1338 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 1340 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
1339 | CONFIG_USB_GADGET_DUALSPEED=y | 1341 | CONFIG_USB_GADGET_DUALSPEED=y |
1340 | CONFIG_USB_ZERO=m | 1342 | CONFIG_USB_ZERO=m |
1341 | # CONFIG_USB_ZERO_HNPTEST is not set | 1343 | # CONFIG_USB_ZERO_HNPTEST is not set |
1344 | # CONFIG_USB_AUDIO is not set | ||
1342 | # CONFIG_USB_ETH is not set | 1345 | # CONFIG_USB_ETH is not set |
1343 | # CONFIG_USB_GADGETFS is not set | 1346 | # CONFIG_USB_GADGETFS is not set |
1344 | CONFIG_USB_FILE_STORAGE=m | 1347 | CONFIG_USB_FILE_STORAGE=m |
1345 | # CONFIG_USB_FILE_STORAGE_TEST is not set | 1348 | # CONFIG_USB_FILE_STORAGE_TEST is not set |
1349 | # CONFIG_USB_MASS_STORAGE is not set | ||
1346 | # CONFIG_USB_G_SERIAL is not set | 1350 | # CONFIG_USB_G_SERIAL is not set |
1347 | # CONFIG_USB_MIDI_GADGET is not set | 1351 | # CONFIG_USB_MIDI_GADGET is not set |
1348 | # CONFIG_USB_G_PRINTER is not set | 1352 | # CONFIG_USB_G_PRINTER is not set |
1349 | # CONFIG_USB_CDC_COMPOSITE is not set | 1353 | # CONFIG_USB_CDC_COMPOSITE is not set |
1354 | CONFIG_USB_G_NOKIA=m | ||
1355 | # CONFIG_USB_G_MULTI is not set | ||
1350 | 1356 | ||
1351 | # | 1357 | # |
1352 | # OTG and related infrastructure | 1358 | # OTG and related infrastructure |
@@ -1355,7 +1361,7 @@ CONFIG_USB_OTG_UTILS=y | |||
1355 | # CONFIG_USB_GPIO_VBUS is not set | 1361 | # CONFIG_USB_GPIO_VBUS is not set |
1356 | # CONFIG_ISP1301_OMAP is not set | 1362 | # CONFIG_ISP1301_OMAP is not set |
1357 | CONFIG_TWL4030_USB=y | 1363 | CONFIG_TWL4030_USB=y |
1358 | CONFIG_MMC=y | 1364 | CONFIG_MMC=m |
1359 | # CONFIG_MMC_DEBUG is not set | 1365 | # CONFIG_MMC_DEBUG is not set |
1360 | # CONFIG_MMC_UNSAFE_RESUME is not set | 1366 | # CONFIG_MMC_UNSAFE_RESUME is not set |
1361 | 1367 | ||
@@ -1363,7 +1369,7 @@ CONFIG_MMC=y | |||
1363 | # MMC/SD/SDIO Card Drivers | 1369 | # MMC/SD/SDIO Card Drivers |
1364 | # | 1370 | # |
1365 | CONFIG_MMC_BLOCK=m | 1371 | CONFIG_MMC_BLOCK=m |
1366 | CONFIG_MMC_BLOCK_BOUNCE=y | 1372 | # CONFIG_MMC_BLOCK_BOUNCE is not set |
1367 | # CONFIG_SDIO_UART is not set | 1373 | # CONFIG_SDIO_UART is not set |
1368 | # CONFIG_MMC_TEST is not set | 1374 | # CONFIG_MMC_TEST is not set |
1369 | 1375 | ||