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/ppc/syslib/open_pic.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/ppc/syslib/open_pic.c')
| -rw-r--r-- | arch/ppc/syslib/open_pic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c index 780a3b9b4fe9..67dffe27b5c3 100644 --- a/arch/ppc/syslib/open_pic.c +++ b/arch/ppc/syslib/open_pic.c | |||
| @@ -1043,7 +1043,7 @@ int openpic_resume(struct sys_device *sysdev) | |||
| 1043 | #endif /* CONFIG_PM */ | 1043 | #endif /* CONFIG_PM */ |
| 1044 | 1044 | ||
| 1045 | static struct sysdev_class openpic_sysclass = { | 1045 | static struct sysdev_class openpic_sysclass = { |
| 1046 | set_kset_name("openpic"), | 1046 | .name = "openpic", |
| 1047 | }; | 1047 | }; |
| 1048 | 1048 | ||
| 1049 | static struct sys_device device_openpic = { | 1049 | static struct sys_device device_openpic = { |