diff options
author | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-05 10:06:08 -0700 |
commit | 580a7ce8fb5012c0c0afe592bdafd482a3679911 (patch) | |
tree | 3fb6b00359a63d8d2e33005599046c105956d314 /arch/arm/mach-omap2/mux.h | |
parent | ARM: OMAP: Config fix for omap3-touchbook board (diff) | |
parent | ARM: OMAP4: Fix array size for irq_target_cpu (diff) | |
download | linux-dev-580a7ce8fb5012c0c0afe592bdafd482a3679911.tar.xz linux-dev-580a7ce8fb5012c0c0afe592bdafd482a3679911.zip |
Merge branch 'fixes-wakeupgen' into fixes
Diffstat (limited to 'arch/arm/mach-omap2/mux.h')
-rw-r--r-- | arch/arm/mach-omap2/mux.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h index 471e62a74a16..76f9b3c2f586 100644 --- a/arch/arm/mach-omap2/mux.h +++ b/arch/arm/mach-omap2/mux.h @@ -127,7 +127,6 @@ struct omap_mux_partition { * @gpio: GPIO number * @muxnames: available signal modes for a ball * @balls: available balls on the package - * @partition: mux partition */ struct omap_mux { u16 reg_offset; |