From 73b467e64658d39293e174c1ffec0b91db47142e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sat, 23 Oct 2010 11:28:42 +0200 Subject: [PATCH] --- yaml --- r: 220529 b: refs/heads/master c: 8654b1c2de1465120974899fc1c8aa00e91d4b7e h: refs/heads/master i: 220527: f5274e605618067c08b87f410823b2d138bef15a v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/Makefile | 4 ---- trunk/arch/x86/platform/Makefile | 1 + trunk/arch/x86/platform/olpc/Makefile | 3 +++ trunk/arch/x86/{kernel => platform/olpc}/olpc-xo1.c | 0 trunk/arch/x86/{kernel => platform/olpc}/olpc.c | 0 trunk/arch/x86/{kernel => platform/olpc}/olpc_ofw.c | 0 7 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 trunk/arch/x86/platform/olpc/Makefile rename trunk/arch/x86/{kernel => platform/olpc}/olpc-xo1.c (100%) rename trunk/arch/x86/{kernel => platform/olpc}/olpc.c (100%) rename trunk/arch/x86/{kernel => platform/olpc}/olpc_ofw.c (100%) diff --git a/[refs] b/[refs] index 59e4645aea3c..0c8766d645c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 329b84e42e3ee348b114fd0bfe4b2421e6139257 +refs/heads/master: 8654b1c2de1465120974899fc1c8aa00e91d4b7e diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile index 08e2e4bf8398..9e13763b6092 100644 --- a/trunk/arch/x86/kernel/Makefile +++ b/trunk/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/trunk/arch/x86/platform/Makefile b/trunk/arch/x86/platform/Makefile index 8519b01f1acb..7bf70b812fa2 100644 --- a/trunk/arch/x86/platform/Makefile +++ b/trunk/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/trunk/arch/x86/platform/olpc/Makefile b/trunk/arch/x86/platform/olpc/Makefile new file mode 100644 index 000000000000..c31b8fcb5a86 --- /dev/null +++ b/trunk/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/trunk/arch/x86/kernel/olpc-xo1.c b/trunk/arch/x86/platform/olpc/olpc-xo1.c similarity index 100% rename from trunk/arch/x86/kernel/olpc-xo1.c rename to trunk/arch/x86/platform/olpc/olpc-xo1.c diff --git a/trunk/arch/x86/kernel/olpc.c b/trunk/arch/x86/platform/olpc/olpc.c similarity index 100% rename from trunk/arch/x86/kernel/olpc.c rename to trunk/arch/x86/platform/olpc/olpc.c diff --git a/trunk/arch/x86/kernel/olpc_ofw.c b/trunk/arch/x86/platform/olpc/olpc_ofw.c similarity index 100% rename from trunk/arch/x86/kernel/olpc_ofw.c rename to trunk/arch/x86/platform/olpc/olpc_ofw.c