diff options
author | Ben Dooks <ben@simtec.co.uk> | 2009-07-18 05:12:25 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-07-18 05:15:53 -0400 |
commit | c197cec5fae7968a7154ee999f0a1b07938d1528 (patch) | |
tree | b99d018333eb9244ad59bf5b9e350396ee31add3 | |
parent | 4b0a84043e0c14088958fddb62f416d050368011 (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>
-rw-r--r-- | arch/arm/plat-s3c/include/plat/devs.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 2 |
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; | |||
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; |
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 | ||
350 | struct platform_device s3c_device_hwmon = { | 350 | struct 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 | }; |