diff options
author | Felipe Balbi <felipe.balbi@nokia.com> | 2010-01-05 09:10:14 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:54:02 -0500 |
commit | bce54fed941e03695ab557100a4bd1e457abca42 (patch) | |
tree | c25b2ff1e6adfbf9ac499ba8bc21c6dce12eda9c /arch/arm | |
parent | f358f5b40af67caf28b627889d007294614170b2 (diff) |
arm: defconfig: rx51: enable phonet and g_nokia
trivial patch enabling g_nokia on rx51_defconfig.
Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/rx51_defconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/configs/rx51_defconfig b/arch/arm/configs/rx51_defconfig index b6eeebb31761..72e27d8401e6 100644 --- a/arch/arm/configs/rx51_defconfig +++ b/arch/arm/configs/rx51_defconfig | |||
@@ -445,6 +445,8 @@ CONFIG_IP_NF_FILTER=m | |||
445 | # CONFIG_LAPB is not set | 445 | # CONFIG_LAPB is not set |
446 | # CONFIG_ECONET is not set | 446 | # CONFIG_ECONET is not set |
447 | # CONFIG_WAN_ROUTER is not set | 447 | # CONFIG_WAN_ROUTER is not set |
448 | CONFIG_PHONET=y | ||
449 | # CONFIG_IEEE802154 is not set | ||
448 | # CONFIG_NET_SCHED is not set | 450 | # CONFIG_NET_SCHED is not set |
449 | # CONFIG_DCB is not set | 451 | # CONFIG_DCB is not set |
450 | 452 | ||
@@ -1325,27 +1327,34 @@ CONFIG_USB_GADGET_SELECTED=y | |||
1325 | # CONFIG_USB_GADGET_LH7A40X is not set | 1327 | # CONFIG_USB_GADGET_LH7A40X is not set |
1326 | # CONFIG_USB_GADGET_OMAP is not set | 1328 | # CONFIG_USB_GADGET_OMAP is not set |
1327 | # CONFIG_USB_GADGET_PXA25X is not set | 1329 | # CONFIG_USB_GADGET_PXA25X is not set |
1330 | # CONFIG_USB_GADGET_R8A66597 is not set | ||
1328 | # CONFIG_USB_GADGET_PXA27X is not set | 1331 | # CONFIG_USB_GADGET_PXA27X is not set |
1329 | # CONFIG_USB_GADGET_S3C2410 is not set | 1332 | # CONFIG_USB_GADGET_S3C_HSOTG is not set |
1330 | # CONFIG_USB_GADGET_IMX is not set | 1333 | # CONFIG_USB_GADGET_IMX is not set |
1334 | # CONFIG_USB_GADGET_S3C2410 is not set | ||
1331 | # CONFIG_USB_GADGET_M66592 is not set | 1335 | # CONFIG_USB_GADGET_M66592 is not set |
1332 | # CONFIG_USB_GADGET_AMD5536UDC is not set | 1336 | # CONFIG_USB_GADGET_AMD5536UDC is not set |
1333 | # CONFIG_USB_GADGET_FSL_QE is not set | 1337 | # CONFIG_USB_GADGET_FSL_QE is not set |
1334 | # CONFIG_USB_GADGET_CI13XXX is not set | 1338 | # CONFIG_USB_GADGET_CI13XXX is not set |
1335 | # CONFIG_USB_GADGET_NET2280 is not set | 1339 | # CONFIG_USB_GADGET_NET2280 is not set |
1336 | # CONFIG_USB_GADGET_GOKU is not set | 1340 | # CONFIG_USB_GADGET_GOKU is not set |
1341 | # CONFIG_USB_GADGET_LANGWELL is not set | ||
1337 | # CONFIG_USB_GADGET_DUMMY_HCD is not set | 1342 | # CONFIG_USB_GADGET_DUMMY_HCD is not set |
1338 | CONFIG_USB_GADGET_DUALSPEED=y | 1343 | CONFIG_USB_GADGET_DUALSPEED=y |
1339 | CONFIG_USB_ZERO=m | 1344 | CONFIG_USB_ZERO=m |
1340 | # CONFIG_USB_ZERO_HNPTEST is not set | 1345 | # CONFIG_USB_ZERO_HNPTEST is not set |
1346 | # CONFIG_USB_AUDIO is not set | ||
1341 | # CONFIG_USB_ETH is not set | 1347 | # CONFIG_USB_ETH is not set |
1342 | # CONFIG_USB_GADGETFS is not set | 1348 | # CONFIG_USB_GADGETFS is not set |
1343 | CONFIG_USB_FILE_STORAGE=m | 1349 | CONFIG_USB_FILE_STORAGE=m |
1344 | # CONFIG_USB_FILE_STORAGE_TEST is not set | 1350 | # CONFIG_USB_FILE_STORAGE_TEST is not set |
1351 | # CONFIG_USB_MASS_STORAGE is not set | ||
1345 | # CONFIG_USB_G_SERIAL is not set | 1352 | # CONFIG_USB_G_SERIAL is not set |
1346 | # CONFIG_USB_MIDI_GADGET is not set | 1353 | # CONFIG_USB_MIDI_GADGET is not set |
1347 | # CONFIG_USB_G_PRINTER is not set | 1354 | # CONFIG_USB_G_PRINTER is not set |
1348 | # CONFIG_USB_CDC_COMPOSITE is not set | 1355 | # CONFIG_USB_CDC_COMPOSITE is not set |
1356 | CONFIG_USB_G_NOKIA=m | ||
1357 | # CONFIG_USB_G_MULTI is not set | ||
1349 | 1358 | ||
1350 | # | 1359 | # |
1351 | # OTG and related infrastructure | 1360 | # OTG and related infrastructure |