Commit-ID: 8654b1c2de1465120974899fc1c8aa00e91d4b7e Gitweb: http://git.kernel.org/tip/8654b1c2de1465120974899fc1c8aa00e91d4b7e Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Sat, 23 Oct 2010 11:28:42 +0200 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Wed, 27 Oct 2010 17:22:16 +0200 x86: Move olpc to platform Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Andres Salomon <dilinger@xxxxxxxxxx> --- arch/x86/kernel/Makefile | 4 ---- arch/x86/platform/Makefile | 1 + arch/x86/platform/olpc/Makefile | 3 +++ arch/x86/{kernel => platform/olpc}/olpc-xo1.c | 0 arch/x86/{kernel => platform/olpc}/olpc.c | 0 arch/x86/{kernel => platform/olpc}/olpc_ofw.c | 0 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 08e2e4b..9e13763 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -101,10 +101,6 @@ obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o -obj-$(CONFIG_OLPC) += olpc.o -obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o -obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o - microcode-y := microcode_core.o microcode-$(CONFIG_MICROCODE_INTEL) += microcode_intel.o microcode-$(CONFIG_MICROCODE_AMD) += microcode_amd.o diff --git a/arch/x86/platform/Makefile b/arch/x86/platform/Makefile index 8519b01..7bf70b8 100644 --- a/arch/x86/platform/Makefile +++ b/arch/x86/platform/Makefile @@ -1,6 +1,7 @@ # Platform specific code goes here obj-y += efi/ obj-y += mrst/ +obj-y += olpc/ obj-y += scx200/ obj-y += sfi/ obj-y += visws/ diff --git a/arch/x86/platform/olpc/Makefile b/arch/x86/platform/olpc/Makefile new file mode 100644 index 0000000..c31b8fc --- /dev/null +++ b/arch/x86/platform/olpc/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_OLPC) += olpc.o +obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o +obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o diff --git a/arch/x86/kernel/olpc-xo1.c b/arch/x86/platform/olpc/olpc-xo1.c similarity index 100% rename from arch/x86/kernel/olpc-xo1.c rename to arch/x86/platform/olpc/olpc-xo1.c diff --git a/arch/x86/kernel/olpc.c b/arch/x86/platform/olpc/olpc.c similarity index 100% rename from arch/x86/kernel/olpc.c rename to arch/x86/platform/olpc/olpc.c diff --git a/arch/x86/kernel/olpc_ofw.c b/arch/x86/platform/olpc/olpc_ofw.c similarity index 100% rename from arch/x86/kernel/olpc_ofw.c rename to arch/x86/platform/olpc/olpc_ofw.c -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html