summaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/mach-kfr2r09/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-09-20 20:24:58 +0200
committerIngo Molnar <mingo@elte.hu>2009-09-20 20:25:03 +0200
commitbfefb7a0c6e08736f2d5917c468467f134bf28bb (patch)
tree7aa7084114dc083fe5b4d7b532901bdeb67188e7 /arch/sh/boards/mach-kfr2r09/Makefile
parent8d0cc631f6dd0a9283ceb7d61d8b85ecbcd355ea (diff)
parent78f28b7c555359c67c2a0d23f7436e915329421e (diff)
downloadkernel-crypto-bfefb7a0c6e08736f2d5917c468467f134bf28bb.tar.gz
kernel-crypto-bfefb7a0c6e08736f2d5917c468467f134bf28bb.tar.xz
kernel-crypto-bfefb7a0c6e08736f2d5917c468467f134bf28bb.zip
Merge branch 'linus' into x86/urgent
Merge reason: Bring in changes that the next patch will depend on. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/boards/mach-kfr2r09/Makefile')
-rw-r--r--arch/sh/boards/mach-kfr2r09/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-kfr2r09/Makefile b/arch/sh/boards/mach-kfr2r09/Makefile
new file mode 100644
index 00000000000..5d5867826e3
--- /dev/null
+++ b/arch/sh/boards/mach-kfr2r09/Makefile
@@ -0,0 +1,2 @@
+obj-y := setup.o
+obj-$(CONFIG_FB_SH_MOBILE_LCDC) += lcd_wqvga.o