From: Jarkko Nikula Date: Fri, 16 Mar 2007 12:00:50 +0000 (+0200) Subject: ARM: OMAP: Update changed TSC2301 config names in N800 board files X-Git-Tag: v2.6.21-omap1~43^2~18 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=66d0f1e9da563261ff13019f33c345d99359fe00;p=linux-2.6-omap-h63xx.git ARM: OMAP: Update changed TSC2301 config names in N800 board files Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/board-n800-audio.c b/arch/arm/mach-omap2/board-n800-audio.c index fa6ab869927..6bdf1c826bf 100644 --- a/arch/arm/mach-omap2/board-n800-audio.c +++ b/arch/arm/mach-omap2/board-n800-audio.c @@ -31,7 +31,7 @@ #include "../plat-omap/dsp/dsp_common.h" -#if defined(CONFIG_SPI_TSC2301_AUDIO) && defined(CONFIG_SND_OMAP24XX_EAC) +#if defined(CONFIG_SND_SOC_TSC2301) && defined(CONFIG_SND_OMAP24XX_EAC) #define AUDIO_ENABLED static struct clk *sys_clkout2; diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c index 69e5d36a5ff..bb805cf0152 100644 --- a/arch/arm/mach-omap2/board-n800.c +++ b/arch/arm/mach-omap2/board-n800.c @@ -409,7 +409,7 @@ static struct platform_device n800_keypad_led_device = { }; #endif -#if defined(CONFIG_SPI_TSC2301_TOUCHSCREEN) +#if defined(CONFIG_TOUCHSCREEN_TSC2301) static void __init n800_ts_set_config(void) { const struct omap_lcd_config *conf;