summaryrefslogtreecommitdiff
path: root/arch/arm/plat-s3c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-08-14 15:23:34 +0100
committerBen Dooks <ben-linux@fluff.org>2009-08-14 15:23:34 +0100
commit0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c (patch)
treeb75f47e26372ffa2374b744a6991144032eea6ef /arch/arm/plat-s3c
parent69e372896791c2e43949b32d4cbe8a714961d3d7 (diff)
parenta2c195fdde20772a90ee98ce3523dcfbda49eee6 (diff)
downloadlinux-3.10-0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c.tar.gz
linux-3.10-0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c.tar.bz2
linux-3.10-0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c.zip
Merge branch 'next-s3c24xx' into next-s3c
Diffstat (limited to 'arch/arm/plat-s3c')
-rw-r--r--arch/arm/plat-s3c/include/plat/devs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h
index 1989ca1bb2b..0f540ea1e99 100644
--- a/arch/arm/plat-s3c/include/plat/devs.h
+++ b/arch/arm/plat-s3c/include/plat/devs.h
@@ -58,5 +58,6 @@ extern struct platform_device s3c_device_usb_hsotg;
#ifdef CONFIG_CPU_S3C2440
extern struct platform_device s3c_device_camif;
+extern struct platform_device s3c_device_ac97;
#endif