diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-07 18:04:15 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-07 18:05:20 -0500 |
| commit | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (patch) | |
| tree | cce7eab28de00a88d75b8eda704f5838e10947b1 /arch/arm/mach-sa1100/include | |
| parent | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (diff) | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc
There were conflicts between fixes going in after 3.3-rc1 and
Russell's stable arm-soc base branch. Resolving it in the dependency
branch so that each topic branch shares the same resolution.
Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9g45.c
Diffstat (limited to 'arch/arm/mach-sa1100/include')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/mcp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/mcp.h b/arch/arm/mach-sa1100/include/mach/mcp.h index 586cec898b35..ed1a331508a7 100644 --- a/arch/arm/mach-sa1100/include/mach/mcp.h +++ b/arch/arm/mach-sa1100/include/mach/mcp.h | |||
| @@ -17,8 +17,6 @@ struct mcp_plat_data { | |||
| 17 | u32 mccr1; | 17 | u32 mccr1; |
| 18 | unsigned int sclk_rate; | 18 | unsigned int sclk_rate; |
| 19 | int gpio_base; | 19 | int gpio_base; |
| 20 | const char *codec; | ||
| 21 | void *codec_pdata; | ||
| 22 | }; | 20 | }; |
| 23 | 21 | ||
| 24 | #endif | 22 | #endif |