diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /arch/arm/mach-omap2/mux.h | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
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 { | |||
| 127 | * @gpio: GPIO number | 127 | * @gpio: GPIO number |
| 128 | * @muxnames: available signal modes for a ball | 128 | * @muxnames: available signal modes for a ball |
| 129 | * @balls: available balls on the package | 129 | * @balls: available balls on the package |
| 130 | * @partition: mux partition | ||
| 131 | */ | 130 | */ |
| 132 | struct omap_mux { | 131 | struct omap_mux { |
| 133 | u16 reg_offset; | 132 | u16 reg_offset; |