From: Thomas Gleixner Date: Sat, 16 Oct 2010 08:35:51 +0000 (+0200) Subject: x86: Move scx200 to platform X-Git-Tag: v2.6.37-rc1~58^2~3 X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=3b3da9d25ae9d8cac99302ad66834499cf324d08 x86: Move scx200 to platform Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 28c4f3f2e97..f57eeea4bc1 100644 --- a/arch/x86/kernel/Makefile +++ b/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/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index e629d7a428c..1191989e9f0 100644 --- a/arch/x86/platform/Makefile +++ b/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/arch/x86/platform/scx200/Makefile b/arch/x86/platform/scx200/Makefile new file mode 100644 index 00000000000..762b4c7f431 --- /dev/null +++ b/arch/x86/platform/scx200/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_SCx200) += scx200.o +scx200-y += scx200_32.o diff --git a/arch/x86/kernel/scx200_32.c b/arch/x86/platform/scx200/scx200_32.c similarity index 100% rename from arch/x86/kernel/scx200_32.c rename to arch/x86/platform/scx200/scx200_32.c