aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBen Dooks <ben@simtec.co.uk>2009-07-18 05:12:25 -0400
committerBen Dooks <ben-linux@fluff.org>2009-07-18 05:15:53 -0400
commitc197cec5fae7968a7154ee999f0a1b07938d1528 (patch)
treeb99d018333eb9244ad59bf5b9e350396ee31add3 /arch
parent4b0a84043e0c14088958fddb62f416d050368011 (diff)
ARM: S3C: Update hwmon device definition and name
Change the hwmon device name to something more generic as this should be functional for both the s3c24xx and s3c64xx archs. Since it has yet to have a driver, it is pretty safe to change as there are no extant users. Also add the necessary entry in devs.h which seems to have been missed out at somepoint. Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-s3c/include/plat/devs.h2
-rw-r--r--arch/arm/plat-s3c24xx/devs.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h
index 2e170827e0b0..1989ca1bb2b1 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;
46extern struct platform_device s3c_device_spi0; 46extern struct platform_device s3c_device_spi0;
47extern struct platform_device s3c_device_spi1; 47extern struct platform_device s3c_device_spi1;
48 48
49extern struct platform_device s3c_device_hwmon;
50
49extern struct platform_device s3c_device_nand; 51extern struct platform_device s3c_device_nand;
50 52
51extern struct platform_device s3c_device_usbgadget; 53extern struct platform_device s3c_device_usbgadget;
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c
index 4eb378c89a39..3489019b5374 100644
--- a/arch/arm/plat-s3c24xx/devs.c
+++ b/arch/arm/plat-s3c24xx/devs.c
@@ -348,7 +348,7 @@ struct platform_device s3c_device_adc = {
348/* HWMON */ 348/* HWMON */
349 349
350struct platform_device s3c_device_hwmon = { 350struct platform_device s3c_device_hwmon = {
351 .name = "s3c24xx-hwmon", 351 .name = "s3c-hwmon",
352 .id = -1, 352 .id = -1,
353 .dev.parent = &s3c_device_adc.dev, 353 .dev.parent = &s3c_device_adc.dev,
354}; 354};