diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 09:09:29 -0400 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /arch/sparc/kernel/pmc.c | |
| parent | 11e4afb49b7fa1fc8e1ffd850c1806dd86a08204 (diff) | |
| parent | 2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (diff) | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/sparc/kernel/pmc.c')
| -rw-r--r-- | arch/sparc/kernel/pmc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pmc.c b/arch/sparc/kernel/pmc.c index 9589d8b9b0c1..94536a85f161 100644 --- a/arch/sparc/kernel/pmc.c +++ b/arch/sparc/kernel/pmc.c | |||
| @@ -51,7 +51,7 @@ static void pmc_swift_idle(void) | |||
| 51 | #endif | 51 | #endif |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | static int __devinit pmc_probe(struct of_device *op, | 54 | static int __devinit pmc_probe(struct platform_device *op, |
| 55 | const struct of_device_id *match) | 55 | const struct of_device_id *match) |
| 56 | { | 56 | { |
| 57 | regs = of_ioremap(&op->resource[0], 0, | 57 | regs = of_ioremap(&op->resource[0], 0, |
| @@ -89,7 +89,7 @@ static struct of_platform_driver pmc_driver = { | |||
| 89 | 89 | ||
| 90 | static int __init pmc_init(void) | 90 | static int __init pmc_init(void) |
| 91 | { | 91 | { |
| 92 | return of_register_driver(&pmc_driver, &of_bus_type); | 92 | return of_register_platform_driver(&pmc_driver); |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | /* This driver is not critical to the boot process | 95 | /* This driver is not critical to the boot process |