diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 10:23:34 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 10:23:34 -0400 |
| commit | 0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c (patch) | |
| tree | b75f47e26372ffa2374b744a6991144032eea6ef /arch/arm/plat-s3c | |
| parent | 69e372896791c2e43949b32d4cbe8a714961d3d7 (diff) | |
| parent | a2c195fdde20772a90ee98ce3523dcfbda49eee6 (diff) | |
Merge branch 'next-s3c24xx' into next-s3c
Diffstat (limited to 'arch/arm/plat-s3c')
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/devs.h | 1 |
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 1989ca1bb2b1..0f540ea1e999 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; | |||
| 58 | #ifdef CONFIG_CPU_S3C2440 | 58 | #ifdef CONFIG_CPU_S3C2440 |
| 59 | 59 | ||
| 60 | extern struct platform_device s3c_device_camif; | 60 | extern struct platform_device s3c_device_camif; |
| 61 | extern struct platform_device s3c_device_ac97; | ||
| 61 | 62 | ||
| 62 | #endif | 63 | #endif |