diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:23:35 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-06 09:23:35 -0500 |
| commit | 3642a0a2c7d2d1949988d0fd004a8039c1f3d02f (patch) | |
| tree | e687c88b1b66ad51a6a6c529f7f328f2d3b625fa /arch/arm/configs/magician_defconfig | |
| parent | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (diff) | |
| parent | b07fed455c883f07f8e847f5b0d79975b4dc8e7a (diff) | |
Merge branch 'mxs/saif' into next/drivers
Conflicts:
drivers/net/ethernet/cadence/Kconfig
Diffstat (limited to 'arch/arm/configs/magician_defconfig')
| -rw-r--r-- | arch/arm/configs/magician_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/magician_defconfig b/arch/arm/configs/magician_defconfig index a88e64d4e9a5..443675d317e6 100644 --- a/arch/arm/configs/magician_defconfig +++ b/arch/arm/configs/magician_defconfig | |||
| @@ -132,7 +132,7 @@ CONFIG_USB_MON=m | |||
| 132 | CONFIG_USB_OHCI_HCD=y | 132 | CONFIG_USB_OHCI_HCD=y |
| 133 | CONFIG_USB_GADGET=y | 133 | CONFIG_USB_GADGET=y |
| 134 | CONFIG_USB_GADGET_VBUS_DRAW=500 | 134 | CONFIG_USB_GADGET_VBUS_DRAW=500 |
| 135 | CONFIG_USB_GADGET_PXA27X=y | 135 | CONFIG_USB_PXA27X=y |
| 136 | CONFIG_USB_ETH=m | 136 | CONFIG_USB_ETH=m |
| 137 | # CONFIG_USB_ETH_RNDIS is not set | 137 | # CONFIG_USB_ETH_RNDIS is not set |
| 138 | CONFIG_USB_GADGETFS=m | 138 | CONFIG_USB_GADGETFS=m |