* [PATCH] ARM: OMAP: Remove double omap_uwire entry in spi Makefile
@ 2007-03-05 19:16 Dirk Behme
2007-03-06 10:44 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: Dirk Behme @ 2007-03-05 19:16 UTC (permalink / raw)
To: linux-omap-open-source
[-- Attachment #1: Type: text/plain, Size: 127 bytes --]
[PATCH] ARM: OMAP: Remove double omap_uwire entry in
drivers/spi/Makefile.
Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
[-- Attachment #2: omap_uwire_double_makefile_entry_fix.txt --]
[-- Type: text/plain, Size: 563 bytes --]
Index: linux-osk/drivers/spi/Makefile
===================================================================
--- linux-osk.orig/drivers/spi/Makefile
+++ 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
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] ARM: OMAP: Remove double omap_uwire entry in spi Makefile
2007-03-05 19:16 [PATCH] ARM: OMAP: Remove double omap_uwire entry in spi Makefile Dirk Behme
@ 2007-03-06 10:44 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2007-03-06 10:44 UTC (permalink / raw)
To: Dirk Behme; +Cc: linux-omap-open-source
* Dirk Behme <dirk.behme@googlemail.com> [070305 11:22]:
>
> [PATCH] ARM: OMAP: Remove double omap_uwire entry in
> drivers/spi/Makefile.
>
> Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
>
> Index: linux-osk/drivers/spi/Makefile
> ===================================================================
> --- linux-osk.orig/drivers/spi/Makefile
> +++ 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
>
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-03-06 10:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-03-05 19:16 [PATCH] ARM: OMAP: Remove double omap_uwire entry in spi Makefile Dirk Behme
2007-03-06 10:44 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox