aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-10-16 04:35:51 -0400
committerThomas Gleixner <tglx@linutronix.de>2010-10-27 08:30:01 -0400
commit3b3da9d25ae9d8cac99302ad66834499cf324d08 (patch)
tree2592a4d15335d49a06de24498b798a52c9f964c0
parentc4e72ad6bbbbbf1f826df3a5d3e3c4af2f4d48c9 (diff)
x86: Move scx200 to platform
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/Makefile3
-rw-r--r--arch/x86/platform/Makefile1
-rw-r--r--arch/x86/platform/scx200/Makefile2
-rw-r--r--arch/x86/platform/scx200/scx200_32.c (renamed from arch/x86/kernel/scx200_32.c)0
4 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 28c4f3f2e97d..f57eeea4bc16 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -101,9 +101,6 @@ obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o
101 101
102obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o 102obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o
103 103
104obj-$(CONFIG_SCx200) += scx200.o
105scx200-y += scx200_32.o
106
107obj-$(CONFIG_OLPC) += olpc.o 104obj-$(CONFIG_OLPC) += olpc.o
108obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o 105obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o
109obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o 106obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o
diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile
index e629d7a428cb..1191989e9f00 100644
--- a/arch/x86/platform/Makefile
+++ b/arch/x86/platform/Makefile
@@ -1,4 +1,5 @@
1# Platform specific code goes here 1# Platform specific code goes here
2obj-y += efi/ 2obj-y += efi/
3obj-y += scx200/
3obj-y += sfi/ 4obj-y += sfi/
4obj-y += visws/ 5obj-y += visws/
diff --git a/arch/x86/platform/scx200/Makefile b/arch/x86/platform/scx200/Makefile
new file mode 100644
index 000000000000..762b4c7f4314
--- /dev/null
+++ b/arch/x86/platform/scx200/Makefile
@@ -0,0 +1,2 @@
1obj-$(CONFIG_SCx200) += scx200.o
2scx200-y += scx200_32.o
diff --git a/arch/x86/kernel/scx200_32.c b/arch/x86/platform/scx200/scx200_32.c
index 7e004acbe526..7e004acbe526 100644
--- a/arch/x86/kernel/scx200_32.c
+++ b/arch/x86/platform/scx200/scx200_32.c