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/mpic.c | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 0da7069c7c62..6ffdda244bb1 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
| @@ -1628,7 +1628,7 @@ static struct sysdev_class mpic_sysclass = { | |||
| 1628 | .resume = mpic_resume, | 1628 | .resume = mpic_resume, |
| 1629 | .suspend = mpic_suspend, | 1629 | .suspend = mpic_suspend, |
| 1630 | #endif | 1630 | #endif |
| 1631 | set_kset_name("mpic"), | 1631 | .name = "mpic", |
| 1632 | }; | 1632 | }; |
| 1633 | 1633 | ||
| 1634 | static int mpic_init_sys(void) | 1634 | static int mpic_init_sys(void) |