---

yaml --- r: 220526 b: refs/heads/master c: 3b3da9d h: refs/heads/master v: v3
git-mirror · Oct 27, 2010 · fbdbfce · fbdbfce
1 parent e24d3dc
commit fbdbfce
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4e72ad6bbbbbf1f826df3a5d3e3c4af2f4d48c9
+refs/heads/master: 3b3da9d25ae9d8cac99302ad66834499cf324d08
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
@@ -101,9 +101,6 @@ obj-$(CONFIG_PARAVIRT_CLOCK)	+= pvclock.o
 
 obj-$(CONFIG_PCSPKR_PLATFORM)	+= pcspeaker.o
 
-obj-$(CONFIG_SCx200)		+= scx200.o
-scx200-y			+= scx200_32.o
-
 obj-$(CONFIG_OLPC)		+= olpc.o
 obj-$(CONFIG_OLPC_XO1)		+= olpc-xo1.o
 obj-$(CONFIG_OLPC_OPENFIRMWARE)	+= olpc_ofw.o

diff --git a/trunk/arch/x86/platform/Makefile b/trunk/arch/x86/platform/Makefile
@@ -1,4 +1,5 @@
 # Platform specific code goes here
 obj-y	+= efi/
+obj-y	+= scx200/
 obj-y	+= sfi/
 obj-y	+= visws/
diff --git a/trunk/arch/x86/platform/scx200/Makefile b/trunk/arch/x86/platform/scx200/Makefile
@@ -0,0 +1,2 @@
+obj-$(CONFIG_SCx200)		+= scx200.o
+scx200-y			+= scx200_32.o
diff --git a/trunk/arch/x86/kernel/scx200_32.c → trunk/arch/x86/platform/scx200/scx200_32.c b/trunk/arch/x86/kernel/scx200_32.c → trunk/arch/x86/platform/scx200/scx200_32.c
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		obj-$(CONFIG_SCx200) += scx200.o
		scx200-y += scx200_32.o