diff options
author | Tony Lindgren <tony@atomide.com> | 2010-09-27 10:15:47 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-09-27 10:15:47 -0700 |
commit | b245f26f5e45a6513a318835d83eea895d3ab54b (patch) | |
tree | ae5cfe08d7152ad28101e642942fc7fb56386322 /arch/arm/mach-omap2/mux.c | |
parent | 5a37e7840f445b551b8bdba3b4f10f7ea365dcfc (diff) | |
parent | 3a63833ec3002816a759a49ebda4e229c089114e (diff) |
Merge branch 'devel-omap-misc' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/mux.c')
-rw-r--r-- | arch/arm/mach-omap2/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index ab403b2ed26..6c2f8f0c0ed 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -87,7 +87,7 @@ static char *omap_mux_options; int __init omap_mux_init_gpio(int gpio, int val) { struct omap_mux_entry *e; - struct omap_mux *gpio_mux; + struct omap_mux *gpio_mux = NULL; u16 old_mode; u16 mux_mode; int found = 0; |