diff options
| author | Ricardo Perez Olivares <x0081762@ti.com> | 2010-06-18 21:26:39 -0500 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-06-18 21:26:39 -0500 |
| commit | d65b5710da9919c4f00bb6b845dcc9a9fe5e4f43 (patch) | |
| tree | d1cb4fc86144be26bfdebe16a418e17d09fe2c7c | |
| parent | 16bac15a3e9a31832a278b16e193b22fd0db9548 (diff) | |
OMAP4: Redefinition_Fix: static struct twl4030_codec_data twl6040_codecti-2.6.34-omap4-L24.7-p2
After merge the following branch:
git://dev.omapzoom.org/pub/scm/misael/kernel-audio.git
a redefinition of the structure:
static struct twl4030_codec_data twl6040_codec
was left.
This patch fix the redefinition problem
Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index a497ed548324..8432ec8c8a43 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -827,17 +827,6 @@ static struct regulator_init_data sdp4430_vusb = { }, }; -static struct twl4030_codec_data twl6040_codec = { -#ifdef CONFIG_OMAP4_AUDIO_PWRON - .audpwron_gpio = 127, -#else - /* provide GPIO number above the valid value - * to mean there is no GPIO connected. */ - .audpwron_gpio = 1024, - .naudint_irq = OMAP44XX_IRQ_SYS_2N, -#endif -}; - static struct twl4030_madc_platform_data sdp4430_gpadc_data = { .irq_line = 1, }; |