Merge tag 'davinci-for-v3.16/board' of git://git.kernel.org/pub/scm/linux/kernel...

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>

diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig
index 2a282c051cfd8bf7c3daf91864dd96a1c27301cc..2f8ff65e3ef12a6e4f9aac7f38c9e8d7a06169ab 100644 (file)
--- 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

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index ecdc7d44fa70aef07279f552e98a6354ed6c3900..06d63d5651f3342be529dc0bc15d1e95b1341e0e 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -350,11 +350,7 @@ static struct davinci_mmc_config dm355evm_mmc_config = {
  * you have proper Mini-B or Mini-A cables (or Mini-A adapters)
  * the ID pin won't need any help.
  */
-#ifdef CONFIG_USB_MUSB_PERIPHERAL
-#define USB_ID_VALUE   0       /* ID pulled high; *should* float */
-#else
 #define USB_ID_VALUE   1       /* ID pulled low */
-#endif
 
 static struct spi_eeprom at25640a = {
        .byte_len       = SZ_64K / 8,

diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 43bacbf153140f7a9e6be87ed5e8b3cbe4012570..680a7a2d9102761c1cdadb1d125b45d92b65d9c0 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -208,11 +208,7 @@ static struct davinci_mmc_config dm355leopard_mmc_config = {
  * you have proper Mini-B or Mini-A cables (or Mini-A adapters)
  * the ID pin won't need any help.
  */
-#ifdef CONFIG_USB_MUSB_PERIPHERAL
-#define USB_ID_VALUE   0       /* ID pulled high; *should* float */
-#else
 #define USB_ID_VALUE   1       /* ID pulled low */
-#endif
 
 static struct spi_eeprom at25640a = {
        .byte_len       = SZ_64K / 8,