diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /drivers/macintosh/via-pmu.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/macintosh/via-pmu.c')
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 82ec12e0edd2..ebec663d5d37 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c | |||
| @@ -2482,7 +2482,7 @@ static int pmu_sys_resume(struct sys_device *sysdev) | |||
| 2482 | #endif /* CONFIG_SUSPEND && CONFIG_PPC32 */ | 2482 | #endif /* CONFIG_SUSPEND && CONFIG_PPC32 */ |
| 2483 | 2483 | ||
| 2484 | static struct sysdev_class pmu_sysclass = { | 2484 | static struct sysdev_class pmu_sysclass = { |
| 2485 | set_kset_name("pmu"), | 2485 | .name = "pmu", |
| 2486 | }; | 2486 | }; |
| 2487 | 2487 | ||
| 2488 | static struct sys_device device_pmu = { | 2488 | static struct sys_device device_pmu = { |