diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-16 04:35:51 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-27 08:30:01 -0400 |
commit | 3b3da9d25ae9d8cac99302ad66834499cf324d08 (patch) | |
tree | 2592a4d15335d49a06de24498b798a52c9f964c0 | |
parent | c4e72ad6bbbbbf1f826df3a5d3e3c4af2f4d48c9 (diff) |
x86: Move scx200 to platform
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/kernel/Makefile | 3 | ||||
-rw-r--r-- | arch/x86/platform/Makefile | 1 | ||||
-rw-r--r-- | arch/x86/platform/scx200/Makefile | 2 | ||||
-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 | ||
102 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o | 102 | obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o |
103 | 103 | ||
104 | obj-$(CONFIG_SCx200) += scx200.o | ||
105 | scx200-y += scx200_32.o | ||
106 | |||
107 | obj-$(CONFIG_OLPC) += olpc.o | 104 | obj-$(CONFIG_OLPC) += olpc.o |
108 | obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o | 105 | obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o |
109 | obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o | 106 | obj-$(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 |
2 | obj-y += efi/ | 2 | obj-y += efi/ |
3 | obj-y += scx200/ | ||
3 | obj-y += sfi/ | 4 | obj-y += sfi/ |
4 | obj-y += visws/ | 5 | obj-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 @@ | |||
1 | obj-$(CONFIG_SCx200) += scx200.o | ||
2 | scx200-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 | |||