diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 21:06:54 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 21:06:54 +0000 |
| commit | 9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf (patch) | |
| tree | 158cd337307a4a4e09a3fb5110f29ab0136bef6c /arch/arm/mach-sa1100/include/mach/mcp.h | |
| parent | 4e7682d077d693e34a993ae7a2831b522930ebcb (diff) | |
| parent | 0af5e4c36e70cfd4ae96d3704a425c414f530f2a (diff) | |
Merge branch 'sa11x0-mcp-fixes' into fixes
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach/mcp.h')
| -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 586cec898b3..ed1a331508a 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 { u32 mccr1; unsigned int sclk_rate; int gpio_base; - const char *codec; - void *codec_pdata; }; #endif |