diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-12-10 09:00:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-12-10 09:00:45 +0100 |
| commit | 97768a8e658605a905ba0d908d1b23b475170bed (patch) | |
| tree | 0431dd9a118c138d164c263033a53502e4c01586 /arch/arm/mach-s3c64xx/mach-smdk6410.c | |
| parent | 9621055fbbb190264cb6a8182b70e3f0f917d770 (diff) | |
| parent | 7a79e94e973639da7bf1b8242d504f9db9e5e848 (diff) | |
| download | linux-97768a8e658605a905ba0d908d1b23b475170bed.tar.bz2 | |
Merge tag 'asoc-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.8
Some incremental updates, nothing too exciting. The biggest block here
is the __dev annotation removal stuff from Bill, everything else is the
usual driver-specific stuff - a combination of fixes and development.
There will be at least more more set of fixes to come but I wanted to
get these out ready for the merge window to make sure Bill's stuff makes
it in.
Diffstat (limited to 'arch/arm/mach-s3c64xx/mach-smdk6410.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index da1a771a29e9..574a9eef588d 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@ -275,7 +275,6 @@ static struct platform_device *smdk6410_devices[] __initdata = { &s3c_device_fb, &s3c_device_ohci, &s3c_device_usb_hsotg, - &samsung_asoc_dma, &s3c64xx_device_iisv4, &samsung_device_keypad, |