diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 17:13:19 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-06 17:13:19 (GMT) |
commit | 500b9fc922cbec572f4fd1436533bfaed5011262 (patch) | |
tree | aac4b7de0871e66740aeaf3510f7a59280026592 /arch/sh/boards/mach-kfr2r09/Makefile | |
parent | f165eb77f49cb6f6e86e2f2f09183904b2965d19 (diff) | |
parent | beccb12f6fbcc73339f127ff1f00638f076c933f (diff) | |
download | linux-fsl-qoriq-500b9fc922cbec572f4fd1436533bfaed5011262.tar.xz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable
Conflicts:
drivers/net/irda/sh_irda.c
Diffstat (limited to 'arch/sh/boards/mach-kfr2r09/Makefile')
-rw-r--r-- | arch/sh/boards/mach-kfr2r09/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sh/boards/mach-kfr2r09/Makefile b/arch/sh/boards/mach-kfr2r09/Makefile index 4e577a3..60dd63f 100644 --- a/arch/sh/boards/mach-kfr2r09/Makefile +++ b/arch/sh/boards/mach-kfr2r09/Makefile @@ -1,2 +1,4 @@ -obj-y := setup.o sdram.o -obj-$(CONFIG_FB_SH_MOBILE_LCDC) += lcd_wqvga.o +obj-y := setup.o sdram.o +ifneq ($(CONFIG_FB_SH_MOBILE_LCDC),) +obj-y += lcd_wqvga.o +endif |