diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-26 14:43:34 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-26 14:43:34 -0700 |
| commit | 03a2ec647be0394b2b94b7a6a8af2310ad704c72 (patch) | |
| tree | 8f0c576d72ee7c141e956044b5db222e296a7216 /arch/arm/configs | |
| parent | a915dfabb51cc807cbb3dd106e051763d27f388c (diff) | |
| parent | ea56785629494394b9e567c0a43690d6c972e137 (diff) | |
Merge tag 'davinci-for-v3.16/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/boards
Merge "DaVinci board changes for v3.16" from Sekhar Nori:
This patch clean-up an unused #define from code.
* tag 'davinci-for-v3.16/board' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: remove checks for CONFIG_USB_MUSB_PERIPHERAL
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/davinci_all_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig index 2a282c051cf..2f8ff65e3ef 100644 --- a/arch/arm/configs/davinci_all_defconfig +++ b/arch/arm/configs/davinci_all_defconfig @@ -160,7 +160,6 @@ CONFIG_USB=m CONFIG_USB_DEVICEFS=y CONFIG_USB_MON=m CONFIG_USB_MUSB_HDRC=m -CONFIG_USB_MUSB_PERIPHERAL=y CONFIG_USB_GADGET_MUSB_HDRC=y CONFIG_MUSB_PIO_ONLY=y CONFIG_USB_STORAGE=m |