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/sysdev/ipic.c | |
parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/sysdev/ipic.c')
-rw-r--r-- | arch/powerpc/sysdev/ipic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c index d7f6a70e78df..ae0dbf4c1d66 100644 --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c | |||
@@ -894,7 +894,7 @@ unsigned int ipic_get_irq(void) | |||
894 | } | 894 | } |
895 | 895 | ||
896 | static struct sysdev_class ipic_sysclass = { | 896 | static struct sysdev_class ipic_sysclass = { |
897 | set_kset_name("ipic"), | 897 | .name = "ipic", |
898 | }; | 898 | }; |
899 | 899 | ||
900 | static struct sys_device device_ipic = { | 900 | static struct sys_device device_ipic = { |