Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a53f169 authored Oct 29, 2009 by Linus Torvalds

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/ppc64: Use preempt_schedule_irq instead of preempt_schedule
  powerpc: Minor cleanup to lib/Kconfig.debug
  powerpc: Minor cleanup to sound/ppc/Kconfig
  powerpc: Minor cleanup to init/Kconfig
  powerpc: Limit memory hotplug support to PPC64 Book-3S machines
  powerpc: Limit hugetlbfs support to PPC64 Book-3S machines
  powerpc: Fix compile errors found by new ppc64e_defconfig
  powerpc: Add a Book-3E 64-bit defconfig
  powerpc/booke: Fix xmon single step on PowerPC Book-E
  powerpc: Align vDSO base address
  powerpc: Fix segment mapping in vdso32
  powerpc/iseries: Remove compiler version dependent hack
  powerpc/perf_events: Fix priority of MSR HV vs PR bits
  powerpc/5200: Update defconfigs
  drivers/serial/mpc52xx_uart.c: Use UPIO_MEM rather than SERIAL_IO_MEM
  powerpc/boot/dts: drop obsolete 'fsl5200-clocking'
  of: Remove nested function
  mpc5200: support for the MAN mpc5200 based board mucmc52
  mpc5200: support for the MAN mpc5200 based board uc101

parents 7fecf0a1 40578fca

arch/powerpc/boot/dts/cm5200.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,6 @@
		compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
		reg = <0x3d40 0x40>;
		interrupts = <2 16 0>;
		fsl5200-clocking;
		};

		sram@8000 {

arch/powerpc/boot/dts/digsy_mtc.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -199,7 +199,6 @@
		compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
		reg = <0x3d00 0x40>;
		interrupts = <2 15 0>;
		fsl5200-clocking;

		rtc@50 {
		compatible = "at,24c08";

arch/powerpc/boot/dts/lite5200.dts

+0 −2

Original line number	Diff line number	Diff line
		@@ -247,7 +247,6 @@
		compatible = "fsl,mpc5200-i2c","fsl-i2c";
		reg = <0x3d00 0x40>;
		interrupts = <2 15 0>;
		fsl5200-clocking;
		};

		i2c@3d40 {
		@@ -256,7 +255,6 @@
		compatible = "fsl,mpc5200-i2c","fsl-i2c";
		reg = <0x3d40 0x40>;
		interrupts = <2 16 0>;
		fsl5200-clocking;
		};
		sram@8000 {
		compatible = "fsl,mpc5200-sram";

arch/powerpc/boot/dts/lite5200b.dts

+0 −2

Original line number	Diff line number	Diff line
		@@ -251,7 +251,6 @@
		compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
		reg = <0x3d00 0x40>;
		interrupts = <2 15 0>;
		fsl5200-clocking;
		};

		i2c@3d40 {
		@@ -260,7 +259,6 @@
		compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
		reg = <0x3d40 0x40>;
		interrupts = <2 16 0>;
		fsl5200-clocking;
		};

		sram@8000 {

arch/powerpc/boot/dts/media5200.dts

+0 −2

Original line number	Diff line number	Diff line
		@@ -223,7 +223,6 @@
		compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
		reg = <0x3d00 0x40>;
		interrupts = <2 15 0>;
		fsl5200-clocking;
		};

		i2c@3d40 {
		@@ -232,7 +231,6 @@
		compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
		reg = <0x3d40 0x40>;
		interrupts = <2 16 0>;
		fsl5200-clocking;
		};

		sram@8000 {