diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/plat-s3c/include/plat/devs.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/plat-s3c/include/plat/devs.h')
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/devs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h index 0f540ea1e99..932cbbbb427 100644 --- a/arch/arm/plat-s3c/include/plat/devs.h +++ b/arch/arm/plat-s3c/include/plat/devs.h | |||
| @@ -28,6 +28,9 @@ extern struct platform_device s3c64xx_device_iis0; | |||
| 28 | extern struct platform_device s3c64xx_device_iis1; | 28 | extern struct platform_device s3c64xx_device_iis1; |
| 29 | extern struct platform_device s3c64xx_device_iisv4; | 29 | extern struct platform_device s3c64xx_device_iisv4; |
| 30 | 30 | ||
| 31 | extern struct platform_device s3c64xx_device_pcm0; | ||
| 32 | extern struct platform_device s3c64xx_device_pcm1; | ||
| 33 | |||
| 31 | extern struct platform_device s3c_device_fb; | 34 | extern struct platform_device s3c_device_fb; |
| 32 | extern struct platform_device s3c_device_usb; | 35 | extern struct platform_device s3c_device_usb; |
| 33 | extern struct platform_device s3c_device_lcd; | 36 | extern struct platform_device s3c_device_lcd; |