diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 18:56:30 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-25 18:57:10 -0400 |
| commit | 7256ecc2b7b91b4212ccc5511cb12254bdf806d0 (patch) | |
| tree | 1a39b3de03cfc92c5b5dedfb01174d17b49df18a /arch/arm/mach-sa1100/include/mach | |
| parent | 18bbff9f679cd470db66402fdb9c577b34324183 (diff) | |
| parent | 6ed3e2acc7995625625592abe8cd3383c34a471b (diff) | |
Merge branch 'sa11x0-mcp' into sa11x0
Conflicts:
arch/arm/mach-sa1100/assabet.c
arch/arm/mach-sa1100/collie.c
arch/arm/mach-sa1100/generic.c
arch/arm/mach-sa1100/lart.c
arch/arm/mach-sa1100/shannon.c
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach')
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/mcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/mcp.h b/arch/arm/mach-sa1100/include/mach/mcp.h index ed1a331508a7..4b2860ae3828 100644 --- a/arch/arm/mach-sa1100/include/mach/mcp.h +++ b/arch/arm/mach-sa1100/include/mach/mcp.h | |||
| @@ -16,7 +16,7 @@ struct mcp_plat_data { | |||
| 16 | u32 mccr0; | 16 | u32 mccr0; |
| 17 | u32 mccr1; | 17 | u32 mccr1; |
| 18 | unsigned int sclk_rate; | 18 | unsigned int sclk_rate; |
| 19 | int gpio_base; | 19 | void *codec_pdata; |
| 20 | }; | 20 | }; |
| 21 | 21 | ||
| 22 | #endif | 22 | #endif |