From 0a0fed051283cf3598a6c1948b5c39b8f831ea5b Mon Sep 17 00:00:00 2001 From: kfx Date: Thu, 18 Nov 2010 20:07:05 +0800 Subject: [PATCH] key.c --> board-rk29sdk-key.c --- arch/arm/mach-rk29/Makefile | 4 ++-- arch/arm/mach-rk29/{key.c => board-rk29sdk-key.c} | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) rename arch/arm/mach-rk29/{key.c => board-rk29sdk-key.c} (93%) diff --git a/arch/arm/mach-rk29/Makefile b/arch/arm/mach-rk29/Makefile index 486c4533338a..df59ba3d11af 100644 --- a/arch/arm/mach-rk29/Makefile +++ b/arch/arm/mach-rk29/Makefile @@ -1,3 +1,3 @@ -obj-y += timer.o io.o devices.o iomux.o clock.o rk29-pl330.o dma.o gpio.o key.o +obj-y += timer.o io.o devices.o iomux.o clock.o rk29-pl330.o dma.o gpio.o obj-$(CONFIG_RK29_VPU) += vpu.o -obj-$(CONFIG_MACH_RK29SDK) += board-rk29sdk.o +obj-$(CONFIG_MACH_RK29SDK) += board-rk29sdk.o board-rk29sdk-key.o diff --git a/arch/arm/mach-rk29/key.c b/arch/arm/mach-rk29/board-rk29sdk-key.c similarity index 93% rename from arch/arm/mach-rk29/key.c rename to arch/arm/mach-rk29/board-rk29sdk-key.c index 8afc28f0d92b..fcf767927e30 100755 --- a/arch/arm/mach-rk29/key.c +++ b/arch/arm/mach-rk29/board-rk29sdk-key.c @@ -8,7 +8,6 @@ #define PRESS_LEV_HIGH 0 static struct rk29_keys_button key_button[] = { -#ifdef CONFIG_MACH_RK29SDK [0] = { .desc = "vol+", .code = KEY_VOLUMEDOWN, @@ -85,7 +84,6 @@ static struct rk29_keys_button key_button[] = { .active_low = PRESS_LEV_LOW, }, #endif -#endif }; struct rk29_keys_platform_data rk29_keys_pdata = { .buttons = key_button, -- 2.34.1