diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-24 00:47:05 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-02-24 00:47:05 +0000 |
| commit | 8aaaaf3cbfb96a9f74c5775c71067a9290244ec7 (patch) | |
| tree | 67349c6a69740150b67c4c39de49cde9b3648aa5 /arch/arm/mach-sa1100/include/mach/mcp.h | |
| parent | 94f61a7666224ab307e387ff0d146055ae77e6ab (diff) | |
| parent | e29206381a1436e0f47c0f5b9a23159a03c57715 (diff) | |
| download | talos-obmc-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.tar.gz talos-obmc-linux-8aaaaf3cbfb96a9f74c5775c71067a9290244ec7.zip | |
Merge branch 'fbdev-for-linus' into fbdev-next
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 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 { u32 mccr1; unsigned int sclk_rate; int gpio_base; - const char *codec; - void *codec_pdata; }; #endif |
