---

yaml --- r: 281621 b: refs/heads/master c: 875a593 h: refs/heads/master i: 281619: 243a3df v: v3
git-mirror · Dec 23, 2011 · a6e823e · a6e823e
1 parent 4507398
commit a6e823e
Show file tree

Hide file tree

Showing 13 changed files with 142 additions and 801 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cecd902ab4d1c489a121ad4b36f8982842802af5
+refs/heads/master: 875a59374cd10200ac24f03877ccd8f73af590cc
diff --git a/trunk/arch/arm/mach-s3c64xx/Makefile b/trunk/arch/arm/mach-s3c64xx/Makefile
@@ -59,4 +59,3 @@ obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o mach-crag6410-module.o
 
 obj-y				+= dev-uart.o
 obj-y				+= dev-audio.o
-obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
diff --git a/trunk/arch/arm/mach-s3c64xx/dev-spi.c b/trunk/arch/arm/mach-s3c64xx/dev-spi.c
diff --git a/trunk/arch/arm/mach-s5p64x0/Makefile b/trunk/arch/arm/mach-s5p64x0/Makefile
@@ -26,7 +26,6 @@ obj-$(CONFIG_MACH_SMDK6450)	+= mach-smdk6450.o
 # device support
 
 obj-y				+= dev-audio.o
-obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
 
 obj-$(CONFIG_S5P64X0_SETUP_I2C1)	+= setup-i2c1.o
 obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP)	+= setup-fb-24bpp.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,4 +59,3 @@ obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o mach-crag6410-module.o

		obj-y += dev-uart.o
		obj-y += dev-audio.o
		obj-$(CONFIG_S3C64XX_DEV_SPI) += dev-spi.o