diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 15:23:15 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 15:23:15 +0100 |
commit | 63c949ea1dcf5d46789f13d8e9c21bb8aeb605cb (patch) | |
tree | ca8e063aed16c0a5e5f51557861dbbad77da8bbb /arch/arm/plat-s3c24xx/devs.c | |
parent | 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd (diff) | |
parent | bff78650a2b0ed42b8fb134b6a9b387e00027d67 (diff) |
Merge branch 'next-s3c-hwmon' into next-s3c
Diffstat (limited to 'arch/arm/plat-s3c24xx/devs.c')
-rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index 4eb378c89a3..3489019b537 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 = { /* HWMON */ struct platform_device s3c_device_hwmon = { - .name = "s3c24xx-hwmon", + .name = "s3c-hwmon", .id = -1, .dev.parent = &s3c_device_adc.dev, }; |