summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c24xx
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2010-05-19 11:04:05 +0200
committerBen Dooks <ben-linux@fluff.org>2010-05-19 11:04:05 +0200
commitf447ea4b1c90fe94f0627d7a6655a402100f8ca5 (patch)
tree980d128c2c68c8c5cd949ae082b11a4540194b95 /arch/arm/plat-s3c24xx
parentARM: Merge for-2635/samsung-dma (diff)
parentARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung (diff)
downloadlinux-f447ea4b1c90fe94f0627d7a6655a402100f8ca5.tar.xz
linux-f447ea4b1c90fe94f0627d7a6655a402100f8ca5.zip
ARM: Merge for-2635/samsung-hwmon
Merge branch 'for-2635/samsung-hwmon' into for-linus/samsung2
Diffstat (limited to 'arch/arm/plat-s3c24xx')
-rw-r--r--arch/arm/plat-s3c24xx/devs.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index b9565c1eb410..cd5b41d0b5a4 100644
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -343,14 +343,6 @@ struct platform_device s3c_device_adc = {
.resource = s3c_adc_resource,
};
-/* HWMON */
-
-struct platform_device s3c_device_hwmon = {
- .name = "s3c-hwmon",
- .id = -1,
- .dev.parent = &s3c_device_adc.dev,
-};
-
/* SDI */
static struct resource s3c_sdi_resource[] = {