Merge branch 'linux-2.6'

2008-01-31 11:25:51 +11:00
parent 4eece4ccf9 5bdeae46be
commit bd45ac0c5d
4468 changed files with 354521 additions and 183267 deletions
--- 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)
 #endif /* CONFIG_SUSPEND && CONFIG_PPC32 */

 static struct sysdev_class pmu_sysclass = {
-	set_kset_name("pmu"),
+	.name = "pmu",
 };

 static struct sys_device device_pmu = {