diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-03-18 18:22:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-03-18 18:22:37 +0100 |
| commit | cb3f2adc03ab055b19c677a6283523861fafebdd (patch) | |
| tree | 59cfb6800f0635a4aec16c8e0da619f27e51ee79 /arch/arm/mach-sa1100/include/mach/mcp.h | |
| parent | Merge branch 'topic/misc' into for-linus (diff) | |
| parent | Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... (diff) | |
| download | linux-cb3f2adc03ab055b19c677a6283523861fafebdd.tar.xz linux-cb3f2adc03ab055b19c677a6283523861fafebdd.zip | |
Merge branch 'topic/asoc' into for-linus
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 |