diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 09:52:00 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 09:52:00 -0500 |
commit | c6ad115876763e4f15055982ecb9579cb7abab5f (patch) | |
tree | 75d2b0f5f31540ff8a2dcdde9e0f087b25c68868 /arch/arm/plat-s3c24xx/devs.c | |
parent | 1d19fdba149f4db055902c30b27adfb7d1ead058 (diff) | |
parent | 28ab44c5be60a9b91021a7cc7b4e202775c04764 (diff) |
Merge branch 'next-s3c24xx' into next-merged
Diffstat (limited to 'arch/arm/plat-s3c24xx/devs.c')
-rw-r--r-- | arch/arm/plat-s3c24xx/devs.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/devs.c b/arch/arm/plat-s3c24xx/devs.c index adf535aaf43..6a33dbc494f 100644 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c | |||
@@ -372,12 +372,20 @@ static struct resource s3c_adc_resource[] = { | |||
372 | }; | 372 | }; |
373 | 373 | ||
374 | struct platform_device s3c_device_adc = { | 374 | struct platform_device s3c_device_adc = { |
375 | .name = "s3c2410-adc", | 375 | .name = "s3c24xx-adc", |
376 | .id = -1, | 376 | .id = -1, |
377 | .num_resources = ARRAY_SIZE(s3c_adc_resource), | 377 | .num_resources = ARRAY_SIZE(s3c_adc_resource), |
378 | .resource = s3c_adc_resource, | 378 | .resource = s3c_adc_resource, |
379 | }; | 379 | }; |
380 | 380 | ||
381 | /* HWMON */ | ||
382 | |||
383 | struct platform_device s3c_device_hwmon = { | ||
384 | .name = "s3c24xx-hwmon", | ||
385 | .id = -1, | ||
386 | .dev.parent = &s3c_device_adc.dev, | ||
387 | }; | ||
388 | |||
381 | /* SDI */ | 389 | /* SDI */ |
382 | 390 | ||
383 | static struct resource s3c_sdi_resource[] = { | 391 | static struct resource s3c_sdi_resource[] = { |