Skip to contentSkip to conversation

ARM: OMAP: Remove double omap_uwire entry in spi Makefile

PATCH In review Dirk Behme 2 participants 2 messages Mar 5, 2007 – Mar 6, 2007 SPI

lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH 1/1 ARM: OMAP: Remove double omap_uwire entry in spi Makefile

[PATCH] ARM: OMAP: Remove double omap_uwire entry in drivers/spi/Makefile.

Signed-off-by Dirk Behme <[email protected]>
drivers/spi/Makefile +0 -1
Index: linux-osk/drivers/spi/Makefile
===================================================================
@@ -16,7 +16,6 @@ obj-$(CONFIG_SPI_ATMEL)			+= atmel_spi.o
 obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
 obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
 obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
-obj-$(CONFIG_SPI_OMAP_UWIRE)		+= omap_uwire.o
 obj-$(CONFIG_SPI_MPC83xx)		+= spi_mpc83xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)		+= spi_s3c24xx_gpio.o
 obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx.o
#1 lore raw
Quoted 13 lines · Dirk Behme

[PATCH] ARM: OMAP: Remove double omap_uwire entry in drivers/spi/Makefile.

Signed-off-by Dirk Behme <[email protected]>

Index: linux-osk/drivers/spi/Makefile
===================================================================

drivers/spi/Makefile obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o · line 21

Quoted 7 lines
drivers/spi/Makefile +0 -1
@@ -16,7 +16,6 @@ obj-$(CONFIG_SPI_ATMEL)			+= atmel_spi.o
 obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
 obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
 obj-$(CONFIG_SPI_PXA2XX)		+= pxa2xx_spi.o
-obj-$(CONFIG_SPI_OMAP_UWIRE)		+= omap_uwire.o
 obj-$(CONFIG_SPI_MPC83xx)		+= spi_mpc83xx.o
 obj-$(CONFIG_SPI_S3C24XX_GPIO)		+= spi_s3c24xx_gpio.o
 obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24xx.o

Pushing today.

Looks like the automerge again while merging from omap-drivers to master branch :) These problems should disappear eventually once the code more in sync again with Linus' tree.

Regards,

Tony