diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:05 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:04:05 -0400 |
| commit | f447ea4b1c90fe94f0627d7a6655a402100f8ca5 (patch) | |
| tree | 980d128c2c68c8c5cd949ae082b11a4540194b95 /arch/arm/plat-s3c24xx | |
| parent | c733a7179cacdf77be9c1eeef02d6e0833919d89 (diff) | |
| parent | 6cd82ffe0cd3836b32b29bd1436e5fd551957d54 (diff) | |
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.c | 8 |
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 = { | |||
| 343 | .resource = s3c_adc_resource, | 343 | .resource = s3c_adc_resource, |
| 344 | }; | 344 | }; |
| 345 | 345 | ||
| 346 | /* HWMON */ | ||
| 347 | |||
| 348 | struct platform_device s3c_device_hwmon = { | ||
| 349 | .name = "s3c-hwmon", | ||
| 350 | .id = -1, | ||
| 351 | .dev.parent = &s3c_device_adc.dev, | ||
| 352 | }; | ||
| 353 | |||
| 354 | /* SDI */ | 346 | /* SDI */ |
| 355 | 347 | ||
| 356 | static struct resource s3c_sdi_resource[] = { | 348 | static struct resource s3c_sdi_resource[] = { |