diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/plat-s3c/include/plat/devs.h | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
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 2e170827e0b0..0f540ea1e999 100644 --- a/arch/arm/plat-s3c/include/plat/devs.h +++ b/arch/arm/plat-s3c/include/plat/devs.h | |||
| @@ -46,6 +46,8 @@ extern struct platform_device s3c_device_hsmmc2; | |||
| 46 | extern struct platform_device s3c_device_spi0; | 46 | extern struct platform_device s3c_device_spi0; |
| 47 | extern struct platform_device s3c_device_spi1; | 47 | extern struct platform_device s3c_device_spi1; |
| 48 | 48 | ||
| 49 | extern struct platform_device s3c_device_hwmon; | ||
| 50 | |||
| 49 | extern struct platform_device s3c_device_nand; | 51 | extern struct platform_device s3c_device_nand; |
| 50 | 52 | ||
| 51 | extern struct platform_device s3c_device_usbgadget; | 53 | extern struct platform_device s3c_device_usbgadget; |
| @@ -56,5 +58,6 @@ extern struct platform_device s3c_device_usb_hsotg; | |||
| 56 | #ifdef CONFIG_CPU_S3C2440 | 58 | #ifdef CONFIG_CPU_S3C2440 |
| 57 | 59 | ||
| 58 | extern struct platform_device s3c_device_camif; | 60 | extern struct platform_device s3c_device_camif; |
| 61 | extern struct platform_device s3c_device_ac97; | ||
| 59 | 62 | ||
| 60 | #endif | 63 | #endif |