diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-10-25 23:20:36 +0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-10-25 23:20:36 +0400 |
commit | c64064ce9376a404e0888ca4a2985c8a4c16cec3 (patch) | |
tree | f34d3b84ca970fdb381dad9a195c1367ce5d10f4 /drivers/pcmcia | |
parent | 21b3de881b38a84002c07b1b4bfb91892644e83f (diff) | |
parent | 456ba5a7802e58eccb5aa9751b3ab515ef99b9ca (diff) | |
download | linux-c64064ce9376a404e0888ca4a2985c8a4c16cec3.tar.xz |
Merge tag 'asoc-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.7
A couple of driver fixes, one that improves the interoperability of
WM8994 with controllers that are sensitive to extra BCLK cycles and some
build break fixes for ux500.
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r-- | drivers/pcmcia/pxa2xx_sharpsl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index b066273b6b4f..7dd879ce514d 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c @@ -194,7 +194,7 @@ static void sharpsl_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) sharpsl_pcmcia_init_reset(skt); } -static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = { +static struct pcmcia_low_level sharpsl_pcmcia_ops = { .owner = THIS_MODULE, .hw_init = sharpsl_pcmcia_hw_init, .socket_state = sharpsl_pcmcia_socket_state, |