diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:33 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:33 -0400 |
| commit | 1770a8988f6178efdc1bfc85fb29deacac49fe91 (patch) | |
| tree | b20b8da8b92e388847a55e7c7da9d919fe3f3abb /arch/arm/plat-samsung | |
| parent | 1e8ff636beb6ee5c87868a6081cc4f95b1ccd713 (diff) | |
| parent | 734552072335b00476b626b027ca4a9f57147b6f (diff) | |
ARM: Merge for-2635/s5p-audio
Merge branch 'for-2635/s5p-audio' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index 796d24258313..ef69e56b2885 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
| @@ -64,6 +64,22 @@ extern struct platform_device s3c_device_nand; | |||
| 64 | extern struct platform_device s3c_device_usbgadget; | 64 | extern struct platform_device s3c_device_usbgadget; |
| 65 | extern struct platform_device s3c_device_usb_hsotg; | 65 | extern struct platform_device s3c_device_usb_hsotg; |
| 66 | 66 | ||
| 67 | extern struct platform_device s5pv210_device_ac97; | ||
| 68 | extern struct platform_device s5pv210_device_pcm0; | ||
| 69 | extern struct platform_device s5pv210_device_pcm1; | ||
| 70 | extern struct platform_device s5pv210_device_pcm2; | ||
| 71 | extern struct platform_device s5pv210_device_iis0; | ||
| 72 | extern struct platform_device s5pv210_device_iis1; | ||
| 73 | extern struct platform_device s5pv210_device_iis2; | ||
| 74 | |||
| 75 | extern struct platform_device s5p6442_device_pcm0; | ||
| 76 | extern struct platform_device s5p6442_device_pcm1; | ||
| 77 | extern struct platform_device s5p6442_device_iis0; | ||
| 78 | extern struct platform_device s5p6442_device_iis1; | ||
| 79 | |||
| 80 | extern struct platform_device s5p6440_device_pcm; | ||
| 81 | extern struct platform_device s5p6440_device_iis; | ||
| 82 | |||
| 67 | /* s3c2440 specific devices */ | 83 | /* s3c2440 specific devices */ |
| 68 | 84 | ||
| 69 | #ifdef CONFIG_CPU_S3C2440 | 85 | #ifdef CONFIG_CPU_S3C2440 |