diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-07-05 15:31:36 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-07-05 15:31:36 +0200 |
| commit | ac3dbeefb8e9108874ab12ba103603893985f4ec (patch) | |
| tree | 0fa8ebf3508bc3da75ab9365abe01a62a18959a3 | |
| parent | omap: mux: Renumber package defines to make room for older 24xx packages (diff) | |
| download | linux-ac3dbeefb8e9108874ab12ba103603893985f4ec.tar.xz linux-ac3dbeefb8e9108874ab12ba103603893985f4ec.zip | |
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>
| -rw-r--r-- | arch/arm/mach-omap2/mux.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/mux.h | 2 |
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) /*----------------------------------------------------------------------------*/ -#ifdef CONFIG_ARCH_OMAP3 +#ifdef CONFIG_ARCH_OMAP2PLUS static LIST_HEAD(muxmodes); static DEFINE_MUTEX(muxmode_mutex); 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 { u16 value; }; -#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_ARCH_OMAP3) +#if defined(CONFIG_OMAP_MUX) /** * omap_mux_init_gpio - initialize a signal based on the GPIO number |