aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/powertv/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-25 14:52:48 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-01-25 14:52:48 +0000
commitf1487fcbe47cd2bc0c71e8598bf9eb6a82dec544 (patch)
tree4c7abed6047538c13dd024a8ecffd15f31b4609a /arch/mips/powertv/Makefile
parent84549d239ab9bb2e3a85c6efcf0e6478a38b4260 (diff)
parent40aa7030e5213a43e9e0554fd7f95534ea310bf3 (diff)
downloadkernel_samsung_tuna-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.zip
kernel_samsung_tuna-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.tar.gz
kernel_samsung_tuna-f1487fcbe47cd2bc0c71e8598bf9eb6a82dec544.tar.bz2
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'arch/mips/powertv/Makefile')
-rw-r--r--arch/mips/powertv/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/powertv/Makefile b/arch/mips/powertv/Makefile
index 2c51671..0a0d73c 100644
--- a/arch/mips/powertv/Makefile
+++ b/arch/mips/powertv/Makefile
@@ -23,6 +23,6 @@
# under Linux.
#
-obj-y += cmdline.o init.o memory.o reset.o time.o powertv_setup.o asic/ pci/
+obj-y += init.o memory.o reset.o time.o powertv_setup.o asic/ pci/
EXTRA_CFLAGS += -Wall -Werror