summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100/include/mach/mcp.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-03-18 21:22:37 +0400
committerTakashi Iwai <tiwai@suse.de>2012-03-18 21:22:37 +0400
commitcb3f2adc03ab055b19c677a6283523861fafebdd (patch)
tree59cfb6800f0635a4aec16c8e0da619f27e51ee79 /arch/arm/mach-sa1100/include/mach/mcp.h
parent44c76a960a62fcc46cbcaa0a22a34e666a729329 (diff)
parent828006de1bddf83b6ecf03ec459c15f7c7c22db7 (diff)
downloadlinux-cb3f2adc03ab055b19c677a6283523861fafebdd.tar.xz
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.h2
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