From: Paul Mackerras <paulus@samba.org>
Date: Thu, 31 Jan 2008 00:25:51 +0000 (+1100)
Subject: Merge branch 'linux-2.6'
X-Git-Tag: v2.6.25-rc1~1131^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd45ac0c5daae35e7c71138172e63df5cf644cf6;p=linux-2.6

Merge branch 'linux-2.6'
---

bd45ac0c5daae35e7c71138172e63df5cf644cf6
diff --cc arch/powerpc/platforms/pasemi/Makefile
index 2cd2a4f26a,e636daa7a8..8f52d75157
--- a/arch/powerpc/platforms/pasemi/Makefile
+++ b/arch/powerpc/platforms/pasemi/Makefile
@@@ -1,3 -1,4 +1,3 @@@
- obj-y	+= setup.o pci.o time.o idle.o powersave.o iommu.o
+ obj-y	+= setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o
  obj-$(CONFIG_PPC_PASEMI_MDIO)	+= gpio_mdio.o
 -obj-$(CONFIG_ELECTRA_IDE) += electra_ide.o
  obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o
diff --cc drivers/macintosh/adb.c
index 5ae28f076d,b7adde4324..7ce0ea6446
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@@ -854,8 -875,5 +854,8 @@@ adbdev_init(void
  	adb_dev_class = class_create(THIS_MODULE, "adb");
  	if (IS_ERR(adb_dev_class))
  		return;
- 	class_device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), NULL, "adb");
+ 	device_create(adb_dev_class, NULL, MKDEV(ADB_MAJOR, 0), "adb");
 +
 +	platform_device_register(&adb_pfdev);
 +	platform_driver_probe(&adb_pfdrv, adb_dummy_probe);
  }
diff --cc drivers/macintosh/via-pmu.c
index 82ec12e0ed,ac420b17e1..ebec663d5d
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@@ -2479,10 -2793,10 +2479,10 @@@ static int pmu_sys_resume(struct sys_de
  	return 0;
  }
  
 -#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 +#endif /* CONFIG_SUSPEND && CONFIG_PPC32 */
  
  static struct sysdev_class pmu_sysclass = {
- 	set_kset_name("pmu"),
+ 	.name = "pmu",
  };
  
  static struct sys_device device_pmu = {