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 /arch/powerpc/platforms/powermac | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/platforms/powermac')
| -rw-r--r-- | arch/powerpc/platforms/powermac/pic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c index cd7216437416..40736400ef80 100644 --- a/arch/powerpc/platforms/powermac/pic.c +++ b/arch/powerpc/platforms/powermac/pic.c | |||
| @@ -663,7 +663,7 @@ static int pmacpic_resume(struct sys_device *sysdev) | |||
| 663 | #endif /* CONFIG_PM && CONFIG_PPC32 */ | 663 | #endif /* CONFIG_PM && CONFIG_PPC32 */ |
| 664 | 664 | ||
| 665 | static struct sysdev_class pmacpic_sysclass = { | 665 | static struct sysdev_class pmacpic_sysclass = { |
| 666 | set_kset_name("pmac_pic"), | 666 | .name = "pmac_pic", |
| 667 | }; | 667 | }; |
| 668 | 668 | ||
| 669 | static struct sys_device device_pmacpic = { | 669 | static struct sys_device device_pmacpic = { |