From a1f50a13670cc05ec88e2fcd203027eabe5e687d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Fri, 10 Aug 2012 16:08:29 +0800 Subject: [PATCH] rk2928: fpga: board-rk2928-fpga.c include board-rk2928-fpga-key.c --- arch/arm/mach-rk2928/Makefile | 2 +- arch/arm/mach-rk2928/board-rk2928-fpga.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-rk2928/Makefile b/arch/arm/mach-rk2928/Makefile index 6e92cad4f2bf..13a891691d1d 100644 --- a/arch/arm/mach-rk2928/Makefile +++ b/arch/arm/mach-rk2928/Makefile @@ -9,5 +9,5 @@ obj-y += clock_data.o obj-$(CONFIG_PM) += pm.o CFLAGS_pm.o += -Os -mthumb -obj-$(CONFIG_MACH_RK2928_FPGA) += board-rk2928-fpga.o board-rk2928-fpga-key.o +obj-$(CONFIG_MACH_RK2928_FPGA) += board-rk2928-fpga.o obj-$(CONFIG_MACH_RK2928_SDK) += board-rk2928-sdk.o diff --git a/arch/arm/mach-rk2928/board-rk2928-fpga.c b/arch/arm/mach-rk2928/board-rk2928-fpga.c index 7fd99583b24c..51411cbd4783 100755 --- a/arch/arm/mach-rk2928/board-rk2928-fpga.c +++ b/arch/arm/mach-rk2928/board-rk2928-fpga.c @@ -492,6 +492,8 @@ static rk_sensor_user_init_data_s rk_init_data_sensor[RK_CAM_NUM] = #endif /* CONFIG_VIDEO_RK29 */ +#include "board-rk2928-fpga-key.c" + /************************************************************************************************** * SDMMC devices, include the module of SD,MMC,and sdio.noted by xbw at 2012-03-05 **************************************************************************************************/ -- 2.34.1