lkml.org 
[lkml]   [2007]   [Apr]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 84/90] ARM: OMAP: Update changed TSC2301 config names in N800 board files
    Date
    From: Jarkko Nikula <jarkko.nikula@nokia.com>

    Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    ---
    arch/arm/mach-omap2/board-n800-audio.c | 2 +-
    arch/arm/mach-omap2/board-n800.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/mach-omap2/board-n800-audio.c b/arch/arm/mach-omap2/board-n800-audio.c
    index fa6ab86..6bdf1c8 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 69e5d36..bb805cf 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;
    --
    1.4.4.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-04-04 20:57    [W:4.018 / U:0.816 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site