Merge branch 'next-s3c24xx' into next-s3c

This commit is contained in:
Ben Dooks
2009-08-14 15:23:34 +01:00
11 changed files with 157 additions and 7 deletions

View File

@ -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