diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-08-23 11:18:47 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-08-23 11:18:47 +0200 |
commit | 8a517c514d5893602cf85c1b4c47afbbc04d2198 (patch) | |
tree | e7c40f68ef97bb2bdb4c366c0b45437bc049feb1 /arch/mips/sibyte/sb1250/Makefile | |
parent | c64b04fe6e0cb7c78e01751a44ef56cf20344e87 (diff) | |
parent | 422bef879e84104fee6dc68ded0e371dbeb5f88e (diff) |
Merge commit 'v2.6.31-rc7' into x86/cpu
Diffstat (limited to 'arch/mips/sibyte/sb1250/Makefile')
-rw-r--r-- | arch/mips/sibyte/sb1250/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/sibyte/sb1250/Makefile b/arch/mips/sibyte/sb1250/Makefile index 697793783a2..1896f4e77a3 100644 --- a/arch/mips/sibyte/sb1250/Makefile +++ b/arch/mips/sibyte/sb1250/Makefile @@ -1,7 +1,6 @@ obj-y := setup.o irq.o time.o obj-$(CONFIG_SMP) += smp.o -obj-$(CONFIG_SIBYTE_STANDALONE) += prom.o obj-$(CONFIG_SIBYTE_BUS_WATCHER) += bus_watcher.o EXTRA_CFLAGS += -Werror |