aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-07-05 09:31:36 -0400
committerTony Lindgren <tony@atomide.com>2010-07-05 09:31:36 -0400
commitac3dbeefb8e9108874ab12ba103603893985f4ec (patch)
tree0fa8ebf3508bc3da75ab9365abe01a62a18959a3 /arch/arm/mach-omap2
parent6dd8a6824af530449112a38c0fa0f95c1a086fc5 (diff)
omap: mux: Allow compiling in new mux code on all mach-omap2 systems
Allow compiling in new mux code on all mach-omap2 systems Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/mux.c2
-rw-r--r--arch/arm/mach-omap2/mux.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 76b5bf761d1d..197e2955843b 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -372,7 +372,7 @@ int __init omap2_mux_init(void)
372 372
373/*----------------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------------*/
374 374
375#ifdef CONFIG_ARCH_OMAP3 375#ifdef CONFIG_ARCH_OMAP2PLUS
376static LIST_HEAD(muxmodes); 376static LIST_HEAD(muxmodes);
377static DEFINE_MUTEX(muxmode_mutex); 377static DEFINE_MUTEX(muxmode_mutex);
378 378
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h
index 46315f2cad57..937a8ca02e12 100644
--- a/arch/arm/mach-omap2/mux.h
+++ b/arch/arm/mach-omap2/mux.h
@@ -104,7 +104,7 @@ struct omap_board_mux {
104 u16 value; 104 u16 value;
105}; 105};
106 106
107#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_ARCH_OMAP3) 107#if defined(CONFIG_OMAP_MUX)
108 108
109/** 109/**
110 * omap_mux_init_gpio - initialize a signal based on the GPIO number 110 * omap_mux_init_gpio - initialize a signal based on the GPIO number