lua: Fixed some cross-platform issues for PPC (and probably other architectures)

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.24 / 700-powerpc_git.patch

diff --git a/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch b/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
index 75c8c2e..e31b814 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/700-powerpc_git.patch
@@ -1,6 +1,5 @@
-diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/kernel-parameters.txt powerpc.git/Documentation/kernel-parameters.txt
---- linux-2.6.24/Documentation/kernel-parameters.txt   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/Documentation/kernel-parameters.txt    2008-01-28 20:25:33.000000000 +0100
+--- a/Documentation/kernel-parameters.txt
++++ b/Documentation/kernel-parameters.txt

 @@ -686,6 +686,7 @@
                        See Documentation/isdn/README.HiSax.
  
 @@ -686,6 +686,7 @@
                        See Documentation/isdn/README.HiSax.
  


@@ -9,9 +8,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/kernel-parameters.txt
  
        i8042.direct    [HW] Put keyboard port into non-translated mode
        i8042.dumbkbd   [HW] Pretend that controller can only read data from
  
        i8042.direct    [HW] Put keyboard port into non-translated mode
        i8042.dumbkbd   [HW] Pretend that controller can only read data from

-diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/00-INDEX powerpc.git/Documentation/powerpc/00-INDEX
---- linux-2.6.24/Documentation/powerpc/00-INDEX        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/Documentation/powerpc/00-INDEX 2008-01-28 20:25:33.000000000 +0100
+--- a/Documentation/powerpc/00-INDEX
++++ b/Documentation/powerpc/00-INDEX

 @@ -28,3 +28,6 @@
        - info on sound support under Linux/PPC
  zImage_layout.txt
 @@ -28,3 +28,6 @@
        - info on sound support under Linux/PPC
  zImage_layout.txt


@@ -19,9 +17,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/00-INDEX powe
 +qe_firmware.txt
 +      - describes the layout of firmware binaries for the Freescale QUICC
 +        Engine and the code that parses and uploads the microcode therein.
 +qe_firmware.txt
 +      - describes the layout of firmware binaries for the Freescale QUICC
 +        Engine and the code that parses and uploads the microcode therein.

-diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-without-of.txt powerpc.git/Documentation/powerpc/booting-without-of.txt
---- linux-2.6.24/Documentation/powerpc/booting-without-of.txt  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/Documentation/powerpc/booting-without-of.txt   2008-01-28 20:25:33.000000000 +0100
+--- a/Documentation/powerpc/booting-without-of.txt
++++ b/Documentation/powerpc/booting-without-of.txt

 @@ -52,7 +52,11 @@
        i) Freescale QUICC Engine module (QE)
        j) CFI or JEDEC memory-mapped NOR flash
 @@ -52,7 +52,11 @@
        i) Freescale QUICC Engine module (QE)
        j) CFI or JEDEC memory-mapped NOR flash


@@ -416,9 +413,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/booting-witho
     More devices will be defined as this spec matures.
  
  VII - Specifying interrupt information for devices
     More devices will be defined as this spec matures.
  
  VII - Specifying interrupt information for devices

-diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/qe_firmware.txt powerpc.git/Documentation/powerpc/qe_firmware.txt
---- linux-2.6.24/Documentation/powerpc/qe_firmware.txt 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/Documentation/powerpc/qe_firmware.txt  2008-01-28 20:25:33.000000000 +0100
+--- /dev/null
++++ b/Documentation/powerpc/qe_firmware.txt

 @@ -0,0 +1,295 @@
 +         Freescale QUICC Engine Firmware Uploading
 +         -----------------------------------------
 @@ -0,0 +1,295 @@
 +         Freescale QUICC Engine Firmware Uploading
 +         -----------------------------------------


@@ -715,9 +711,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/Documentation/powerpc/qe_firmware.t
 +
 +A Python program that creates firmware binaries from the header files normally
 +distributed by Freescale can be found on http://opensource.freescale.com.
 +
 +A Python program that creates firmware binaries from the header files normally
 +distributed by Freescale can be found on http://opensource.freescale.com.

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig powerpc.git/arch/powerpc/Kconfig
---- linux-2.6.24/arch/powerpc/Kconfig  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/Kconfig   2008-01-28 21:37:04.000000000 +0100
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig

 @@ -140,6 +140,9 @@
          Used to allow a board to specify it wants a uImage built by default
        default n
 @@ -140,6 +140,9 @@
          Used to allow a board to specify it wants a uImage built by default
        default n


@@ -760,9 +755,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig powerpc.git/ar
        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx
        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx
        default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                && !PPC_85xx && !PPC_86xx
        default PCI_PERMEDIA if !4xx && !CPM2 && !8xx

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig.debug powerpc.git/arch/powerpc/Kconfig.debug
---- linux-2.6.24/arch/powerpc/Kconfig.debug    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/Kconfig.debug     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/Kconfig.debug
++++ b/arch/powerpc/Kconfig.debug

 @@ -151,6 +151,13 @@
  
  config PPC_EARLY_DEBUG
 @@ -151,6 +151,13 @@
  
  config PPC_EARLY_DEBUG


@@ -816,9 +810,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Kconfig.debug powerpc.
  config PPC_EARLY_DEBUG_CPM_ADDR
        hex "CPM UART early debug transmit descriptor address"
        depends on PPC_EARLY_DEBUG_CPM
  config PPC_EARLY_DEBUG_CPM_ADDR
        hex "CPM UART early debug transmit descriptor address"
        depends on PPC_EARLY_DEBUG_CPM

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Makefile powerpc.git/arch/powerpc/Makefile
---- linux-2.6.24/arch/powerpc/Makefile 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/Makefile  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/Makefile
++++ b/arch/powerpc/Makefile

 @@ -167,6 +167,9 @@
  $(BOOT_TARGETS): vmlinux
        $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
 @@ -167,6 +167,9 @@
  $(BOOT_TARGETS): vmlinux
        $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)


@@ -829,9 +822,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/Makefile powerpc.git/a
  define archhelp
    @echo '* zImage          - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
    @echo '  install         - Install kernel using'
  define archhelp
    @echo '* zImage          - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
    @echo '  install         - Install kernel using'

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git/arch/powerpc/boot/4xx.c
---- linux-2.6.24/arch/powerpc/boot/4xx.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/4xx.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/4xx.c
++++ b/arch/powerpc/boot/4xx.c

 @@ -22,16 +22,14 @@
  #include "dcr.h"
  
 @@ -22,16 +22,14 @@
  #include "dcr.h"
  


@@ -1405,9 +1397,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.c powerpc.git
 -      dt_fixup_clock("/plb/opb/serial@ef600600", uart0);
 +      dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
  }
 -      dt_fixup_clock("/plb/opb/serial@ef600600", uart0);
 +      dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.h powerpc.git/arch/powerpc/boot/4xx.h
---- linux-2.6.24/arch/powerpc/boot/4xx.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/4xx.h        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/4xx.h
++++ b/arch/powerpc/boot/4xx.h

 @@ -11,12 +11,22 @@
  #ifndef _POWERPC_BOOT_4XX_H_
  #define _POWERPC_BOOT_4XX_H_
 @@ -11,12 +11,22 @@
  #ifndef _POWERPC_BOOT_4XX_H_
  #define _POWERPC_BOOT_4XX_H_


@@ -1433,9 +1424,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/4xx.h powerpc.git
 +                          unsigned int tmr_clk);
  
  #endif /* _POWERPC_BOOT_4XX_H_ */
 +                          unsigned int tmr_clk);
  
  #endif /* _POWERPC_BOOT_4XX_H_ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/Makefile powerpc.git/arch/powerpc/boot/Makefile
---- linux-2.6.24/arch/powerpc/boot/Makefile    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/Makefile     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/Makefile
++++ b/arch/powerpc/boot/Makefile

 @@ -33,12 +33,15 @@
  BOOTCFLAGS    += -fno-stack-protector
  endif
 @@ -33,12 +33,15 @@
  BOOTCFLAGS    += -fno-stack-protector
  endif


@@ -1621,9 +1611,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/Makefile powerpc.
 +
 +$(obj)/bootwrapper_install: $(all-installed)
 +
 +
 +$(obj)/bootwrapper_install: $(all-installed)
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/bamboo.c powerpc.git/arch/powerpc/boot/bamboo.c
---- linux-2.6.24/arch/powerpc/boot/bamboo.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/bamboo.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/bamboo.c
++++ b/arch/powerpc/boot/bamboo.c

 @@ -30,8 +30,8 @@
  {
        unsigned long sysclk = 33333333;
 @@ -30,8 +30,8 @@
  {
        unsigned long sysclk = 33333333;


@@ -1643,9 +1632,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/bamboo.c powerpc.
 +      fdt_init(_dtb_start);
        serial_console_init();
  }
 +      fdt_init(_dtb_start);
        serial_console_init();
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-52xx.c powerpc.git/arch/powerpc/boot/cuboot-52xx.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-52xx.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-52xx.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/cuboot-52xx.c
++++ b/arch/powerpc/boot/cuboot-52xx.c

 @@ -53,7 +53,7 @@
                     unsigned long r6, unsigned long r7)
  {
 @@ -53,7 +53,7 @@
                     unsigned long r6, unsigned long r7)
  {


@@ -1655,9 +1643,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-52xx.c pow
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-824x.c powerpc.git/arch/powerpc/boot/cuboot-824x.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-824x.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-824x.c        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/cuboot-824x.c

 @@ -0,0 +1,53 @@
 +/*
 + * Old U-boot compatibility for 824x
 @@ -0,0 +1,53 @@
 +/*
 + * Old U-boot compatibility for 824x


@@ -1712,9 +1699,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-824x.c pow
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-83xx.c powerpc.git/arch/powerpc/boot/cuboot-83xx.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-83xx.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-83xx.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/cuboot-83xx.c
++++ b/arch/powerpc/boot/cuboot-83xx.c

 @@ -24,7 +24,8 @@
        void *soc;
  
 @@ -24,7 +24,8 @@
        void *soc;
  


@@ -1734,9 +1720,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-83xx.c pow
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-85xx.c powerpc.git/arch/powerpc/boot/cuboot-85xx.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-85xx.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-85xx.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/cuboot-85xx.c
++++ b/arch/powerpc/boot/cuboot-85xx.c

 @@ -24,8 +24,9 @@
        void *soc;
  
 @@ -24,8 +24,9 @@
        void *soc;
  


@@ -1758,9 +1743,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-85xx.c pow
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-8xx.c powerpc.git/arch/powerpc/boot/cuboot-8xx.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-8xx.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-8xx.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/cuboot-8xx.c
++++ b/arch/powerpc/boot/cuboot-8xx.c

 @@ -41,7 +41,7 @@
                     unsigned long r6, unsigned long r7)
  {
 @@ -41,7 +41,7 @@
                     unsigned long r6, unsigned long r7)
  {


@@ -1770,9 +1754,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-8xx.c powe
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-hpc2.c powerpc.git/arch/powerpc/boot/cuboot-hpc2.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-hpc2.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-hpc2.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/cuboot-hpc2.c
++++ b/arch/powerpc/boot/cuboot-hpc2.c

 @@ -42,7 +42,7 @@
                unsigned long r6, unsigned long r7)
  {
 @@ -42,7 +42,7 @@
                unsigned long r6, unsigned long r7)
  {


@@ -1782,9 +1765,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-hpc2.c pow
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-katmai.c powerpc.git/arch/powerpc/boot/cuboot-katmai.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-katmai.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-katmai.c      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/cuboot-katmai.c

 @@ -0,0 +1,56 @@
 +/*
 + * Old U-boot compatibility for Katmai
 @@ -0,0 +1,56 @@
 +/*
 + * Old U-boot compatibility for Katmai


@@ -1842,9 +1824,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-katmai.c p
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-pq2.c powerpc.git/arch/powerpc/boot/cuboot-pq2.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-pq2.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-pq2.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/cuboot-pq2.c
++++ b/arch/powerpc/boot/cuboot-pq2.c

 @@ -255,7 +255,7 @@
                     unsigned long r6, unsigned long r7)
  {
 @@ -255,7 +255,7 @@
                     unsigned long r6, unsigned long r7)
  {


@@ -1854,9 +1835,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-pq2.c powe
        serial_console_init();
        platform_ops.fixups = pq2_platform_fixups;
  }
        serial_console_init();
        platform_ops.fixups = pq2_platform_fixups;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-rainier.c powerpc.git/arch/powerpc/boot/cuboot-rainier.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-rainier.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-rainier.c     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/cuboot-rainier.c

 @@ -0,0 +1,56 @@
 +/*
 + * Old U-boot compatibility for Rainier
 @@ -0,0 +1,56 @@
 +/*
 + * Old U-boot compatibility for Rainier


@@ -1914,9 +1894,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-rainier.c
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-sequoia.c powerpc.git/arch/powerpc/boot/cuboot-sequoia.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-sequoia.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-sequoia.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/cuboot-sequoia.c
++++ b/arch/powerpc/boot/cuboot-sequoia.c

 @@ -39,7 +39,7 @@
  {
        unsigned long sysclk = 33333333;
 @@ -39,7 +39,7 @@
  {
        unsigned long sysclk = 33333333;


@@ -1934,9 +1913,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-sequoia.c
 +      fdt_init(_dtb_start);
        serial_console_init();
  }
 +      fdt_init(_dtb_start);
        serial_console_init();
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-taishan.c powerpc.git/arch/powerpc/boot/cuboot-taishan.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-taishan.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-taishan.c     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/cuboot-taishan.c

 @@ -0,0 +1,54 @@
 +/*
 + * Old U-boot compatibility for Taishan
 @@ -0,0 +1,54 @@
 +/*
 + * Old U-boot compatibility for Taishan


@@ -1992,9 +1970,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-taishan.c
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-warp.c powerpc.git/arch/powerpc/boot/cuboot-warp.c
---- linux-2.6.24/arch/powerpc/boot/cuboot-warp.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/cuboot-warp.c        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/cuboot-warp.c

 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 2008 PIKA Technologies
 @@ -0,0 +1,39 @@
 +/*
 + * Copyright (c) 2008 PIKA Technologies


@@ -2035,9 +2012,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/cuboot-warp.c pow
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}
 +      fdt_init(_dtb_start);
 +      serial_console_init();
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dcr.h powerpc.git/arch/powerpc/boot/dcr.h
---- linux-2.6.24/arch/powerpc/boot/dcr.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dcr.h        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dcr.h
++++ b/arch/powerpc/boot/dcr.h

 @@ -14,12 +14,20 @@
  #define DCRN_SDRAM0_CFGADDR                           0x010
  #define DCRN_SDRAM0_CFGDATA                           0x011
 @@ -14,12 +14,20 @@
  #define DCRN_SDRAM0_CFGADDR                           0x010
  #define DCRN_SDRAM0_CFGDATA                           0x011


@@ -2115,9 +2091,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dcr.h powerpc.git
 +
  
  #endif        /* _PPC_BOOT_DCR_H_ */
 +
  
  #endif        /* _PPC_BOOT_DCR_H_ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/devtree.c powerpc.git/arch/powerpc/boot/devtree.c
---- linux-2.6.24/arch/powerpc/boot/devtree.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/devtree.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/devtree.c
++++ b/arch/powerpc/boot/devtree.c

 @@ -88,6 +88,20 @@
        }
  }
 @@ -88,6 +88,20 @@
        }
  }


@@ -2139,9 +2114,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/devtree.c powerpc
  void dt_fixup_mac_address(u32 index, const u8 *addr)
  {
        void *devp = find_node_by_prop_value(NULL, "linux,network-index",
  void dt_fixup_mac_address(u32 index, const u8 *addr)
  {
        void *devp = find_node_by_prop_value(NULL, "linux,network-index",

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/Makefile.dtc powerpc.git/arch/powerpc/boot/dtc-src/Makefile.dtc
---- linux-2.6.24/arch/powerpc/boot/dtc-src/Makefile.dtc        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/Makefile.dtc 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/Makefile.dtc

 @@ -0,0 +1,25 @@
 +# Makefile.dtc
 +#
 @@ -0,0 +1,25 @@
 +# Makefile.dtc
 +#


@@ -2168,9 +2142,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/Makefile.
 +# things, but we supply the dependencies on generated header files explicitly
 +
 +$(addprefix $(DTC_objdir)/,$(DTC_GEN_SRCS:%.c=%.o)): $(addprefix $(DTC_objdir)/,$(DTC_BISON_INCLUDES))
 +# things, but we supply the dependencies on generated header files explicitly
 +
 +$(addprefix $(DTC_objdir)/,$(DTC_GEN_SRCS:%.c=%.o)): $(addprefix $(DTC_objdir)/,$(DTC_BISON_INCLUDES))

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/checks.c powerpc.git/arch/powerpc/boot/dtc-src/checks.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/checks.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/checks.c     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/checks.c

 @@ -0,0 +1,750 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2007.
 @@ -0,0 +1,750 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2007.


@@ -2922,9 +2895,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/checks.c
 +
 +      return 1;
 +}
 +
 +      return 1;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/data.c powerpc.git/arch/powerpc/boot/dtc-src/data.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/data.c      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/data.c       2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/data.c

 @@ -0,0 +1,321 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,321 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -3247,9 +3219,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/data.c po
 +
 +      return 1;
 +}
 +
 +      return 1;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer.l powerpc.git/arch/powerpc/boot/dtc-src/dtc-lexer.l
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer.l 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc-lexer.l  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/dtc-lexer.l

 @@ -0,0 +1,328 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,328 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -3579,9 +3550,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer
 +
 +      return 1;
 +}
 +
 +      return 1;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped powerpc.git/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped

 @@ -0,0 +1,2174 @@
 +#line 2 "dtc-lexer.lex.c"
 +
 @@ -0,0 +1,2174 @@
 +#line 2 "dtc-lexer.lex.c"
 +


@@ -5757,9 +5727,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-lexer
 +      return 1;
 +}
 +
 +      return 1;
 +}
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped

 @@ -0,0 +1,1983 @@
 +/* A Bison parser, made by GNU Bison 2.3.  */
 +
 @@ -0,0 +1,1983 @@
 +/* A Bison parser, made by GNU Bison 2.3.  */
 +


@@ -7744,9 +7713,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parse
 +      return val;
 +}
 +
 +      return val;
 +}
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped

 @@ -0,0 +1,111 @@
 +/* A Bison parser, made by GNU Bison 2.3.  */
 +
 @@ -0,0 +1,111 @@
 +/* A Bison parser, made by GNU Bison 2.3.  */
 +


@@ -7859,9 +7827,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parse
 +#endif
 +
 +extern YYLTYPE yylloc;
 +#endif
 +
 +extern YYLTYPE yylloc;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.y powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.y
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parser.y        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc-parser.y 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/dtc-parser.y

 @@ -0,0 +1,336 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,336 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -8199,9 +8166,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc-parse
 +              yyerror("bad literal");
 +      return val;
 +}
 +              yyerror("bad literal");
 +      return val;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.c powerpc.git/arch/powerpc/boot/dtc-src/dtc.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc.c        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/dtc.c

 @@ -0,0 +1,231 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,231 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -8434,9 +8400,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.c pow
 +
 +      exit(0);
 +}
 +
 +      exit(0);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.h powerpc.git/arch/powerpc/boot/dtc-src/dtc.h
---- linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.h       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/dtc.h        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/dtc.h

 @@ -0,0 +1,269 @@
 +#ifndef _DTC_H
 +#define _DTC_H
 @@ -0,0 +1,269 @@
 +#ifndef _DTC_H
 +#define _DTC_H


@@ -8707,9 +8672,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/dtc.h pow
 +void fill_fullpaths(struct node *tree, const char *prefix);
 +
 +#endif /* _DTC_H */
 +void fill_fullpaths(struct node *tree, const char *prefix);
 +
 +#endif /* _DTC_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/flattree.c powerpc.git/arch/powerpc/boot/dtc-src/flattree.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/flattree.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/flattree.c   2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/flattree.c

 @@ -0,0 +1,968 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,968 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -9679,9 +9643,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/flattree.
 +
 +      return build_boot_info(reservelist, tree);
 +}
 +
 +      return build_boot_info(reservelist, tree);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/fstree.c powerpc.git/arch/powerpc/boot/dtc-src/fstree.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/fstree.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/fstree.c     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/fstree.c

 @@ -0,0 +1,94 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,94 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -9777,9 +9740,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/fstree.c
 +      return build_boot_info(NULL, tree);
 +}
 +
 +      return build_boot_info(NULL, tree);
 +}
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/livetree.c powerpc.git/arch/powerpc/boot/dtc-src/livetree.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/livetree.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/livetree.c   2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/livetree.c

 @@ -0,0 +1,305 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,305 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -10086,9 +10048,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/livetree.
 +
 +      return node->phandle;
 +}
 +
 +      return node->phandle;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.c powerpc.git/arch/powerpc/boot/dtc-src/srcpos.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/srcpos.c     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/srcpos.c

 @@ -0,0 +1,105 @@
 +/*
 + * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.
 @@ -0,0 +1,105 @@
 +/*
 + * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.


@@ -10195,9 +10156,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.c
 +{
 +      return srcpos_filename_for_num(srcpos_filenum);
 +}
 +{
 +      return srcpos_filename_for_num(srcpos_filenum);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.h powerpc.git/arch/powerpc/boot/dtc-src/srcpos.h
---- linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.h    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/srcpos.h     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/srcpos.h

 @@ -0,0 +1,75 @@
 +/*
 + * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.
 @@ -0,0 +1,75 @@
 +/*
 + * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.


@@ -10274,9 +10234,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/srcpos.h
 +extern int lookup_file_name(const char *fname, int add_it);
 +extern const char *srcpos_filename_for_num(int filenum);
 +const char *srcpos_get_filename(void);
 +extern int lookup_file_name(const char *fname, int add_it);
 +extern const char *srcpos_filename_for_num(int filenum);
 +const char *srcpos_get_filename(void);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/treesource.c powerpc.git/arch/powerpc/boot/dtc-src/treesource.c
---- linux-2.6.24/arch/powerpc/boot/dtc-src/treesource.c        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/treesource.c 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/treesource.c

 @@ -0,0 +1,275 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
 @@ -0,0 +1,275 @@
 +/*
 + * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.


@@ -10553,14 +10512,12 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/treesourc
 +      write_tree_source_node(f, bi->dt, 0);
 +}
 +
 +      write_tree_source_node(f, bi->dt, 0);
 +}
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dtc-src/version_gen.h powerpc.git/arch/powerpc/boot/dtc-src/version_gen.h
---- linux-2.6.24/arch/powerpc/boot/dtc-src/version_gen.h       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dtc-src/version_gen.h        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dtc-src/version_gen.h

 @@ -0,0 +1 @@
 +#define DTC_VERSION "DTC 1.0.0-gd6f9b62f"
 @@ -0,0 +1 @@
 +#define DTC_VERSION "DTC 1.0.0-gd6f9b62f"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/adder875-redboot.dts powerpc.git/arch/powerpc/boot/dts/adder875-redboot.dts
---- linux-2.6.24/arch/powerpc/boot/dts/adder875-redboot.dts    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/adder875-redboot.dts     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/adder875-redboot.dts

 @@ -0,0 +1,184 @@
 +/*
 + * Device Tree Source for MPC885 ADS running RedBoot
 @@ -0,0 +1,184 @@
 +/*
 + * Device Tree Source for MPC885 ADS running RedBoot


@@ -10746,9 +10703,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/adder875-redb
 +              linux,stdout-path = &console;
 +      };
 +};
 +              linux,stdout-path = &console;
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/adder875-uboot.dts powerpc.git/arch/powerpc/boot/dts/adder875-uboot.dts
---- linux-2.6.24/arch/powerpc/boot/dts/adder875-uboot.dts      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/adder875-uboot.dts       2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/adder875-uboot.dts

 @@ -0,0 +1,183 @@
 +/*
 + * Device Tree Source for MPC885 ADS running U-Boot
 @@ -0,0 +1,183 @@
 +/*
 + * Device Tree Source for MPC885 ADS running U-Boot


@@ -10933,9 +10889,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/adder875-uboo
 +              linux,stdout-path = &console;
 +      };
 +};
 +              linux,stdout-path = &console;
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/bamboo.dts powerpc.git/arch/powerpc/boot/dts/bamboo.dts
---- linux-2.6.24/arch/powerpc/boot/dts/bamboo.dts      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/bamboo.dts       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/bamboo.dts
++++ b/arch/powerpc/boot/dts/bamboo.dts

 @@ -16,14 +16,24 @@
        #size-cells = <1>;
        model = "amcc,bamboo";
 @@ -16,14 +16,24 @@
        #size-cells = <1>;
        model = "amcc,bamboo";


@@ -11029,9 +10984,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/bamboo.dts po
 -              bootargs = "console=ttyS0,115200";
        };
  };
 -              bootargs = "console=ttyS0,115200";
        };
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/cm5200.dts powerpc.git/arch/powerpc/boot/dts/cm5200.dts
---- linux-2.6.24/arch/powerpc/boot/dts/cm5200.dts      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/cm5200.dts       2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/cm5200.dts

 @@ -0,0 +1,236 @@
 +/*
 + * CM5200 board Device Tree Source
 @@ -0,0 +1,236 @@
 +/*
 + * CM5200 board Device Tree Source


@@ -11269,9 +11223,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/cm5200.dts po
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ebony.dts powerpc.git/arch/powerpc/boot/dts/ebony.dts
---- linux-2.6.24/arch/powerpc/boot/dts/ebony.dts       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/ebony.dts        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/ebony.dts
++++ b/arch/powerpc/boot/dts/ebony.dts

 @@ -16,14 +16,22 @@
        #size-cells = <1>;
        model = "ibm,ebony";
 @@ -16,14 +16,22 @@
        #size-cells = <1>;
        model = "ibm,ebony";


@@ -11359,9 +11312,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ebony.dts pow
                };
        };
  
                };
        };
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ep405.dts powerpc.git/arch/powerpc/boot/dts/ep405.dts
---- linux-2.6.24/arch/powerpc/boot/dts/ep405.dts       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/ep405.dts        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/ep405.dts

 @@ -0,0 +1,228 @@
 +/*
 + * Device Tree Source for EP405
 @@ -0,0 +1,228 @@
 +/*
 + * Device Tree Source for EP405


@@ -11591,9 +11543,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ep405.dts pow
 +              linux,stdout-path = "/plb/opb/serial@ef600300";
 +      };
 +};
 +              linux,stdout-path = "/plb/opb/serial@ef600300";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ep8248e.dts powerpc.git/arch/powerpc/boot/dts/ep8248e.dts
---- linux-2.6.24/arch/powerpc/boot/dts/ep8248e.dts     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/ep8248e.dts      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/ep8248e.dts

 @@ -0,0 +1,207 @@
 +/*
 + * Device Tree for the Embedded Planet EP8248E board running PlanetCore.
 @@ -0,0 +1,207 @@
 +/*
 + * Device Tree for the Embedded Planet EP8248E board running PlanetCore.


@@ -11802,9 +11753,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/ep8248e.dts p
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/haleakala.dts powerpc.git/arch/powerpc/boot/dts/haleakala.dts
---- linux-2.6.24/arch/powerpc/boot/dts/haleakala.dts   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/haleakala.dts    2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/haleakala.dts

 @@ -0,0 +1,274 @@
 +/*
 + * Device Tree Source for AMCC Haleakala (405EXr)
 @@ -0,0 +1,274 @@
 +/*
 + * Device Tree Source for AMCC Haleakala (405EXr)


@@ -12080,9 +12030,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/haleakala.dts
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/katmai.dts powerpc.git/arch/powerpc/boot/dts/katmai.dts
---- linux-2.6.24/arch/powerpc/boot/dts/katmai.dts      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/katmai.dts       2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/katmai.dts

 @@ -0,0 +1,400 @@
 +/*
 + * Device Tree Source for AMCC Katmai eval board
 @@ -0,0 +1,400 @@
 +/*
 + * Device Tree Source for AMCC Katmai eval board


@@ -12484,9 +12433,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/katmai.dts po
 +              linux,stdout-path = "/plb/opb/serial@10000200";
 +      };
 +};
 +              linux,stdout-path = "/plb/opb/serial@10000200";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kilauea.dts powerpc.git/arch/powerpc/boot/dts/kilauea.dts
---- linux-2.6.24/arch/powerpc/boot/dts/kilauea.dts     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/kilauea.dts      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/kilauea.dts
++++ b/arch/powerpc/boot/dts/kilauea.dts

 @@ -13,14 +13,22 @@
        #size-cells = <1>;
        model = "amcc,kilauea";
 @@ -13,14 +13,22 @@
        #size-cells = <1>;
        model = "amcc,kilauea";


@@ -12621,9 +12569,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kilauea.dts p
 +              };
        };
  };
 +              };
        };
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHD.dts powerpc.git/arch/powerpc/boot/dts/kuroboxHD.dts
---- linux-2.6.24/arch/powerpc/boot/dts/kuroboxHD.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/kuroboxHD.dts    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/kuroboxHD.dts
++++ b/arch/powerpc/boot/dts/kuroboxHD.dts

 @@ -23,6 +23,12 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -23,6 +23,12 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -12675,9 +12622,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHD.dts
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHG.dts powerpc.git/arch/powerpc/boot/dts/kuroboxHG.dts
---- linux-2.6.24/arch/powerpc/boot/dts/kuroboxHG.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/kuroboxHG.dts    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/kuroboxHG.dts
++++ b/arch/powerpc/boot/dts/kuroboxHG.dts

 @@ -23,6 +23,12 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -23,6 +23,12 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -12729,9 +12675,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/kuroboxHG.dts
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;
                        #address-cells = <3>;
                        #size-cells = <2>;
                        #interrupt-cells = <1>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/lite5200.dts powerpc.git/arch/powerpc/boot/dts/lite5200.dts
---- linux-2.6.24/arch/powerpc/boot/dts/lite5200.dts    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/lite5200.dts     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/lite5200.dts
++++ b/arch/powerpc/boot/dts/lite5200.dts

 @@ -19,7 +19,7 @@
  / {
        model = "fsl,lite5200";
 @@ -19,7 +19,7 @@
  / {
        model = "fsl,lite5200";


@@ -12761,9 +12706,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/lite5200.dts
                        compatible = "mpc5200-i2c","fsl-i2c";
                        cell-index = <1>;
                        reg = <3d40 40>;
                        compatible = "mpc5200-i2c","fsl-i2c";
                        cell-index = <1>;
                        reg = <3d40 40>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/lite5200b.dts powerpc.git/arch/powerpc/boot/dts/lite5200b.dts
---- linux-2.6.24/arch/powerpc/boot/dts/lite5200b.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/lite5200b.dts    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/lite5200b.dts
++++ b/arch/powerpc/boot/dts/lite5200b.dts

 @@ -19,7 +19,7 @@
  / {
        model = "fsl,lite5200b";
 @@ -19,7 +19,7 @@
  / {
        model = "fsl,lite5200b";


@@ -12793,9 +12737,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/lite5200b.dts
                        compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
                        cell-index = <1>;
                        reg = <3d40 40>;
                        compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
                        cell-index = <1>;
                        reg = <3d40 40>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/makalu.dts powerpc.git/arch/powerpc/boot/dts/makalu.dts
---- linux-2.6.24/arch/powerpc/boot/dts/makalu.dts      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/makalu.dts       2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/makalu.dts

 @@ -0,0 +1,347 @@
 +/*
 + * Device Tree Source for AMCC Makalu (405EX)
 @@ -0,0 +1,347 @@
 +/*
 + * Device Tree Source for AMCC Makalu (405EX)


@@ -13144,9 +13087,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/makalu.dts po
 +              };
 +      };
 +};
 +              };
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/motionpro.dts powerpc.git/arch/powerpc/boot/dts/motionpro.dts
---- linux-2.6.24/arch/powerpc/boot/dts/motionpro.dts   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/motionpro.dts    2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/motionpro.dts

 @@ -0,0 +1,309 @@
 +/*
 + * Motion-PRO board Device Tree Source
 @@ -0,0 +1,309 @@
 +/*
 + * Motion-PRO board Device Tree Source


@@ -13457,9 +13399,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/motionpro.dts
 +                        01000000 0 00000000 b0000000 0 01000000>;
 +      };
 +};
 +                        01000000 0 00000000 b0000000 0 01000000>;
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts powerpc.git/arch/powerpc/boot/dts/mpc8313erdb.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.dts 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8313erdb.dts  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
++++ b/arch/powerpc/boot/dts/mpc8313erdb.dts

 @@ -15,6 +15,14 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -15,6 +15,14 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -13628,9 +13569,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8313erdb.d
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc832x_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc832x_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc832x_mds.dts 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc832x_mds.dts  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
++++ b/arch/powerpc/boot/dts/mpc832x_mds.dts

 @@ -7,6 +7,18 @@
   * under  the terms of  the GNU General  Public License as published by the
   * Free Software Foundation;  either version 2 of the  License, or (at your
 @@ -7,6 +7,18 @@
   * under  the terms of  the GNU General  Public License as published by the
   * Free Software Foundation;  either version 2 of the  License, or (at your


@@ -13821,9 +13761,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc832x_mds.d
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x11 AD17 */
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x11 AD17 */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc832x_rdb.dts powerpc.git/arch/powerpc/boot/dts/mpc832x_rdb.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc832x_rdb.dts 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc832x_rdb.dts  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
++++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts

 @@ -15,6 +15,14 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -15,6 +15,14 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -13933,9 +13872,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc832x_rdb.d
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x10 AD16 (USB) */
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x10 AD16 (USB) */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitx.dts powerpc.git/arch/powerpc/boot/dts/mpc8349emitx.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitx.dts        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8349emitx.dts 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
++++ b/arch/powerpc/boot/dts/mpc8349emitx.dts

 @@ -14,6 +14,15 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -14,6 +14,15 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -14122,9 +14060,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitx.
 +              };
 +      };
  };
 +              };
 +      };
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitxgp.dts powerpc.git/arch/powerpc/boot/dts/mpc8349emitxgp.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitxgp.dts      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8349emitxgp.dts       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
++++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts

 @@ -14,6 +14,13 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -14,6 +14,13 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -14223,9 +14160,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8349emitxg
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x0F - PCI Slot */
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
                                /* IDSEL 0x0F - PCI Slot */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc834x_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc834x_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc834x_mds.dts 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc834x_mds.dts  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
++++ b/arch/powerpc/boot/dts/mpc834x_mds.dts

 @@ -15,6 +15,15 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -15,6 +15,15 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -14373,9 +14309,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc834x_mds.d
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc836x_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc836x_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc836x_mds.dts 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc836x_mds.dts  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
++++ b/arch/powerpc/boot/dts/mpc836x_mds.dts

 @@ -20,6 +20,14 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -20,6 +20,14 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -14501,9 +14436,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc836x_mds.d
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8377_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc8377_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8377_mds.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8377_mds.dts  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/mpc8377_mds.dts

 @@ -0,0 +1,279 @@
 +/*
 + * MPC8377E MDS Device Tree Source
 @@ -0,0 +1,279 @@
 +/*
 + * MPC8377E MDS Device Tree Source


@@ -14784,9 +14718,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8377_mds.d
 +              device_type = "pci";
 +      };
 +};
 +              device_type = "pci";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8378_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc8378_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8378_mds.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8378_mds.dts  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/mpc8378_mds.dts

 @@ -0,0 +1,265 @@
 +/*
 + * MPC8378E MDS Device Tree Source
 @@ -0,0 +1,265 @@
 +/*
 + * MPC8378E MDS Device Tree Source


@@ -15053,9 +14986,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8378_mds.d
 +              device_type = "pci";
 +      };
 +};
 +              device_type = "pci";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8379_mds.dts powerpc.git/arch/powerpc/boot/dts/mpc8379_mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8379_mds.dts 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8379_mds.dts  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/mpc8379_mds.dts

 @@ -0,0 +1,293 @@
 +/*
 + * MPC8379E MDS Device Tree Source
 @@ -0,0 +1,293 @@
 +/*
 + * MPC8379E MDS Device Tree Source


@@ -15350,9 +15282,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8379_mds.d
 +              device_type = "pci";
 +      };
 +};
 +              device_type = "pci";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8540ads.dts powerpc.git/arch/powerpc/boot/dts/mpc8540ads.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8540ads.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8540ads.dts   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8540ads.dts
++++ b/arch/powerpc/boot/dts/mpc8540ads.dts

 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -15485,9 +15416,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8540ads.dt
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8541cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8541cds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8541cds.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8541cds.dts   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8541cds.dts
++++ b/arch/powerpc/boot/dts/mpc8541cds.dts

 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -15596,9 +15526,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8541cds.dt
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8544ds.dts powerpc.git/arch/powerpc/boot/dts/mpc8544ds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8544ds.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8544ds.dts    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8544ds.dts
++++ b/arch/powerpc/boot/dts/mpc8544ds.dts

 @@ -15,6 +15,17 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -15,6 +15,17 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -15758,9 +15687,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8544ds.dts
 -
        };
  };
 -
        };
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8548cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8548cds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8548cds.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8548cds.dts   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8548cds.dts
++++ b/arch/powerpc/boot/dts/mpc8548cds.dts

 @@ -16,6 +16,20 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,20 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -15917,9 +15845,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8548cds.dt
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8555cds.dts powerpc.git/arch/powerpc/boot/dts/mpc8555cds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8555cds.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8555cds.dts   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8555cds.dts
++++ b/arch/powerpc/boot/dts/mpc8555cds.dts

 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,15 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -16028,9 +15955,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8555cds.dt
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8560ads.dts powerpc.git/arch/powerpc/boot/dts/mpc8560ads.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8560ads.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8560ads.dts   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8560ads.dts
++++ b/arch/powerpc/boot/dts/mpc8560ads.dts

 @@ -16,6 +16,16 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,16 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -16170,9 +16096,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8560ads.dt
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;
                #interrupt-cells = <1>;
                #size-cells = <2>;
                #address-cells = <3>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8568mds.dts powerpc.git/arch/powerpc/boot/dts/mpc8568mds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8568mds.dts  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8568mds.dts   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8568mds.dts
++++ b/arch/powerpc/boot/dts/mpc8568mds.dts

 @@ -20,6 +20,17 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -20,6 +20,17 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -16365,9 +16290,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8568mds.dt
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  
                interrupt-map-mask = <f800 0 0 7>;
                interrupt-map = <
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8572ds.dts powerpc.git/arch/powerpc/boot/dts/mpc8572ds.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8572ds.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8572ds.dts    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8572ds.dts
++++ b/arch/powerpc/boot/dts/mpc8572ds.dts

 @@ -15,6 +15,18 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -15,6 +15,18 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -16540,9 +16464,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8572ds.dts
                interrupt-map = <
                        /* IDSEL 0x0 */
                        0000 0 0 1 &mpic 0 1
                interrupt-map = <
                        /* IDSEL 0x0 */
                        0000 0 0 1 &mpic 0 1

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8610_hpcd.dts powerpc.git/arch/powerpc/boot/dts/mpc8610_hpcd.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8610_hpcd.dts        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8610_hpcd.dts 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
++++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts

 @@ -1,7 +1,7 @@
  /*
   * MPC8610 HPCD Device Tree Source
 @@ -1,7 +1,7 @@
  /*
   * MPC8610 HPCD Device Tree Source


@@ -16757,9 +16680,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8610_hpcd.
                compatible = "fsl,mpc8641-pcie";
                device_type = "pci";
                #interrupt-cells = <1>;
                compatible = "fsl,mpc8641-pcie";
                device_type = "pci";
                #interrupt-cells = <1>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8641_hpcn.dts powerpc.git/arch/powerpc/boot/dts/mpc8641_hpcn.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc8641_hpcn.dts        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc8641_hpcn.dts 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
++++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts

 @@ -16,6 +16,17 @@
        #address-cells = <1>;
        #size-cells = <1>;
 @@ -16,6 +16,17 @@
        #address-cells = <1>;
        #size-cells = <1>;


@@ -17004,9 +16926,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc8641_hpcn.
                compatible = "fsl,mpc8641-pcie";
                device_type = "pci";
                #interrupt-cells = <1>;
                compatible = "fsl,mpc8641-pcie";
                device_type = "pci";
                #interrupt-cells = <1>;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc866ads.dts powerpc.git/arch/powerpc/boot/dts/mpc866ads.dts
---- linux-2.6.24/arch/powerpc/boot/dts/mpc866ads.dts   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/mpc866ads.dts    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/mpc866ads.dts
++++ b/arch/powerpc/boot/dts/mpc866ads.dts

 @@ -12,7 +12,7 @@
  
  / {
 @@ -12,7 +12,7 @@
  
  / {


@@ -17233,9 +17154,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/mpc866ads.dts
 +              linux,stdout-path = "/soc/cpm/serial@a80";
 +      };
  };
 +              linux,stdout-path = "/soc/cpm/serial@a80";
 +      };
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/rainier.dts powerpc.git/arch/powerpc/boot/dts/rainier.dts
---- linux-2.6.24/arch/powerpc/boot/dts/rainier.dts     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/rainier.dts      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/rainier.dts

 @@ -0,0 +1,353 @@
 +/*
 + * Device Tree Source for AMCC Rainier
 @@ -0,0 +1,353 @@
 +/*
 + * Device Tree Source for AMCC Rainier


@@ -17590,9 +17510,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/rainier.dts p
 +              bootargs = "console=ttyS0,115200";
 +      };
 +};
 +              bootargs = "console=ttyS0,115200";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/sequoia.dts powerpc.git/arch/powerpc/boot/dts/sequoia.dts
---- linux-2.6.24/arch/powerpc/boot/dts/sequoia.dts     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/sequoia.dts      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/sequoia.dts
++++ b/arch/powerpc/boot/dts/sequoia.dts

 @@ -17,14 +17,24 @@
        #size-cells = <1>;
        model = "amcc,sequoia";
 @@ -17,14 +17,24 @@
        #size-cells = <1>;
        model = "amcc,sequoia";


@@ -17676,9 +17595,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/sequoia.dts p
        };
  
        chosen {
        };
  
        chosen {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/storcenter.dts powerpc.git/arch/powerpc/boot/dts/storcenter.dts
---- linux-2.6.24/arch/powerpc/boot/dts/storcenter.dts  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/storcenter.dts   2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/storcenter.dts

 @@ -0,0 +1,138 @@
 +/*
 + * Device Tree Source for IOMEGA StorCenter
 @@ -0,0 +1,138 @@
 +/*
 + * Device Tree Source for IOMEGA StorCenter


@@ -17818,9 +17736,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/storcenter.dt
 +              linux,stdout-path = "/soc/serial@4500";
 +      };
 +};
 +              linux,stdout-path = "/soc/serial@4500";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/taishan.dts powerpc.git/arch/powerpc/boot/dts/taishan.dts
---- linux-2.6.24/arch/powerpc/boot/dts/taishan.dts     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/taishan.dts      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/taishan.dts

 @@ -0,0 +1,383 @@
 +/*
 + * Device Tree Source for IBM/AMCC Taishan
 @@ -0,0 +1,383 @@
 +/*
 + * Device Tree Source for IBM/AMCC Taishan


@@ -18205,9 +18122,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/taishan.dts p
 +              linux,stdout-path = "/plb/opb/serial@40000300";
 +      };
 +};
 +              linux,stdout-path = "/plb/opb/serial@40000300";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/tqm5200.dts powerpc.git/arch/powerpc/boot/dts/tqm5200.dts
---- linux-2.6.24/arch/powerpc/boot/dts/tqm5200.dts     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/tqm5200.dts      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/tqm5200.dts

 @@ -0,0 +1,184 @@
 +/*
 + * TQM5200 board Device Tree Source
 @@ -0,0 +1,184 @@
 +/*
 + * TQM5200 board Device Tree Source


@@ -18393,9 +18309,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/tqm5200.dts p
 +                        01000000 0 00000000 a0000000 0 01000000>;
 +      };
 +};
 +                        01000000 0 00000000 a0000000 0 01000000>;
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/walnut.dts powerpc.git/arch/powerpc/boot/dts/walnut.dts
---- linux-2.6.24/arch/powerpc/boot/dts/walnut.dts      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/walnut.dts       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/dts/walnut.dts
++++ b/arch/powerpc/boot/dts/walnut.dts

 @@ -14,14 +14,21 @@
        #size-cells = <1>;
        model = "ibm,walnut";
 @@ -14,14 +14,21 @@
        #size-cells = <1>;
        model = "ibm,walnut";


@@ -18479,9 +18394,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/walnut.dts po
        };
  
        chosen {
        };
  
        chosen {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/warp.dts powerpc.git/arch/powerpc/boot/dts/warp.dts
---- linux-2.6.24/arch/powerpc/boot/dts/warp.dts        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/dts/warp.dts 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/dts/warp.dts

 @@ -0,0 +1,239 @@
 +/*
 + * Device Tree Source for PIKA Warp
 @@ -0,0 +1,239 @@
 +/*
 + * Device Tree Source for PIKA Warp


@@ -18722,9 +18636,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/dts/warp.dts powe
 +              linux,stdout-path = "/plb/opb/serial@ef600300";
 +      };
 +};
 +              linux,stdout-path = "/plb/opb/serial@ef600300";
 +      };
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ebony.c powerpc.git/arch/powerpc/boot/ebony.c
---- linux-2.6.24/arch/powerpc/boot/ebony.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ebony.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/ebony.c
++++ b/arch/powerpc/boot/ebony.c

 @@ -31,66 +31,6 @@
  
  static u8 *ebony_mac0, *ebony_mac1;
 @@ -31,66 +31,6 @@
  
  static u8 *ebony_mac0, *ebony_mac1;


@@ -18809,9 +18722,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ebony.c powerpc.g
 +      fdt_init(_dtb_start);
        serial_console_init();
  }
 +      fdt_init(_dtb_start);
        serial_console_init();
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep405.c powerpc.git/arch/powerpc/boot/ep405.c
---- linux-2.6.24/arch/powerpc/boot/ep405.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ep405.c      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/ep405.c

 @@ -0,0 +1,74 @@
 +/*
 + * Embedded Planet EP405 with PlanetCore firmware
 @@ -0,0 +1,74 @@
 +/*
 + * Embedded Planet EP405 with PlanetCore firmware


@@ -18887,9 +18799,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep405.c powerpc.g
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep8248e.c powerpc.git/arch/powerpc/boot/ep8248e.c
---- linux-2.6.24/arch/powerpc/boot/ep8248e.c   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ep8248e.c    2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/ep8248e.c

 @@ -0,0 +1,55 @@
 +/*
 + * Embedded Planet EP8248E with PlanetCore firmware
 @@ -0,0 +1,55 @@
 +/*
 + * Embedded Planet EP8248E with PlanetCore firmware


@@ -18946,9 +18857,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep8248e.c powerpc
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}
 +      serial_console_init();
 +      platform_ops.fixups = platform_fixups;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep88xc.c powerpc.git/arch/powerpc/boot/ep88xc.c
---- linux-2.6.24/arch/powerpc/boot/ep88xc.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ep88xc.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/ep88xc.c
++++ b/arch/powerpc/boot/ep88xc.c

 @@ -45,7 +45,7 @@
        mem_size *= 1024 * 1024;
        simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);
 @@ -45,7 +45,7 @@
        mem_size *= 1024 * 1024;
        simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);


@@ -18958,9 +18868,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ep88xc.c powerpc.
  
        planetcore_set_stdout_path(table);
  
  
        planetcore_set_stdout_path(table);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree.c powerpc.git/arch/powerpc/boot/flatdevtree.c
---- linux-2.6.24/arch/powerpc/boot/flatdevtree.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/flatdevtree.c        1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/boot/flatdevtree.c
++++ /dev/null

 @@ -1,1036 +0,0 @@
 -/*
 - * This program is free software; you can redistribute it and/or modify
 @@ -1,1036 +0,0 @@
 -/*
 - * This program is free software; you can redistribute it and/or modify


@@ -19998,9 +19907,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree.c pow
 -
 -      return buf;
 -}
 -
 -      return buf;
 -}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree.h powerpc.git/arch/powerpc/boot/flatdevtree.h
---- linux-2.6.24/arch/powerpc/boot/flatdevtree.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/flatdevtree.h        1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/boot/flatdevtree.h
++++ /dev/null

 @@ -1,113 +0,0 @@
 -/*
 - * This program is free software; you can redistribute it and/or modify
 @@ -1,113 +0,0 @@
 -/*
 - * This program is free software; you can redistribute it and/or modify


@@ -20115,9 +20023,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree.h pow
 -char *ft_get_path(struct ft_cxt *cxt, const void *phandle, char *buf, int len);
 -
 -#endif /* FLATDEVTREE_H */
 -char *ft_get_path(struct ft_cxt *cxt, const void *phandle, char *buf, int len);
 -
 -#endif /* FLATDEVTREE_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree_misc.c powerpc.git/arch/powerpc/boot/flatdevtree_misc.c
---- linux-2.6.24/arch/powerpc/boot/flatdevtree_misc.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/flatdevtree_misc.c   1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/boot/flatdevtree_misc.c
++++ /dev/null

 @@ -1,79 +0,0 @@
 -/*
 - * This file does the necessary interface mapping between the bootwrapper
 @@ -1,79 +0,0 @@
 -/*
 - * This file does the necessary interface mapping between the bootwrapper


@@ -20198,9 +20105,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/flatdevtree_misc.
 -      return ft_open(&cxt, dt_blob, max_size, max_find_device,
 -                      platform_ops.realloc);
 -}
 -      return ft_open(&cxt, dt_blob, max_size, max_find_device,
 -                      platform_ops.realloc);
 -}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/holly.c powerpc.git/arch/powerpc/boot/holly.c
---- linux-2.6.24/arch/powerpc/boot/holly.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/holly.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/holly.c
++++ b/arch/powerpc/boot/holly.c

 @@ -28,6 +28,6 @@
        u32 heapsize = 0x8000000 - (u32)_end; /* 128M */
  
 @@ -28,6 +28,6 @@
        u32 heapsize = 0x8000000 - (u32)_end; /* 128M */
  


@@ -20209,9 +20115,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/holly.c powerpc.g
 +      fdt_init(_dtb_start);
        serial_console_init();
  }
 +      fdt_init(_dtb_start);
        serial_console_init();
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/Makefile.libfdt powerpc.git/arch/powerpc/boot/libfdt/Makefile.libfdt
---- linux-2.6.24/arch/powerpc/boot/libfdt/Makefile.libfdt      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/Makefile.libfdt       2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt/Makefile.libfdt

 @@ -0,0 +1,14 @@
 +# Makefile.libfdt
 +#
 @@ -0,0 +1,14 @@
 +# Makefile.libfdt
 +#


@@ -20227,9 +20132,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/Makefile.l
 +
 +$(LIBFDT_objdir)/$(LIBFDT_LIB): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS))
 +
 +
 +$(LIBFDT_objdir)/$(LIBFDT_LIB): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS))
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt.c powerpc.git/arch/powerpc/boot/libfdt/fdt.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt.c        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt.c 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt/fdt.c

 @@ -0,0 +1,156 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,156 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -20387,9 +20291,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt.c powe
 +      memmove(buf, fdt, fdt_totalsize(fdt));
 +      return 0;
 +}
 +      memmove(buf, fdt, fdt_totalsize(fdt));
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt.h powerpc.git/arch/powerpc/boot/libfdt/fdt.h
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt.h        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt.h 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt/fdt.h

 @@ -0,0 +1,60 @@
 +#ifndef _FDT_H
 +#define _FDT_H
 @@ -0,0 +1,60 @@
 +#ifndef _FDT_H
 +#define _FDT_H


@@ -20451,9 +20354,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt.h powe
 +#define FDT_V17_SIZE  (FDT_V16_SIZE + sizeof(uint32_t))
 +
 +#endif /* _FDT_H */
 +#define FDT_V17_SIZE  (FDT_V16_SIZE + sizeof(uint32_t))
 +
 +#endif /* _FDT_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_ro.c powerpc.git/arch/powerpc/boot/libfdt/fdt_ro.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt_ro.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt_ro.c      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt/fdt_ro.c

 @@ -0,0 +1,583 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,583 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -21038,9 +20940,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_ro.c p
 +
 +      return -FDT_ERR_NOTFOUND;
 +}
 +
 +      return -FDT_ERR_NOTFOUND;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_rw.c powerpc.git/arch/powerpc/boot/libfdt/fdt_rw.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt_rw.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt_rw.c      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt/fdt_rw.c

 @@ -0,0 +1,447 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,447 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -21489,9 +21390,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_rw.c p
 +
 +      return 0;
 +}
 +
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_strerror.c powerpc.git/arch/powerpc/boot/libfdt/fdt_strerror.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt_strerror.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt_strerror.c        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt/fdt_strerror.c

 @@ -0,0 +1,96 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,96 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -21589,9 +21489,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_strerr
 +
 +      return "<unknown error>";
 +}
 +
 +      return "<unknown error>";
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_sw.c powerpc.git/arch/powerpc/boot/libfdt/fdt_sw.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt_sw.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt_sw.c      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt/fdt_sw.c

 @@ -0,0 +1,258 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,258 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -21851,9 +21750,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_sw.c p
 +      fdt_set_magic(fdt, FDT_MAGIC);
 +      return 0;
 +}
 +      fdt_set_magic(fdt, FDT_MAGIC);
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_wip.c powerpc.git/arch/powerpc/boot/libfdt/fdt_wip.c
---- linux-2.6.24/arch/powerpc/boot/libfdt/fdt_wip.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/fdt_wip.c     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt/fdt_wip.c

 @@ -0,0 +1,144 @@
 +/*
 + * libfdt - Flat Device Tree manipulation
 @@ -0,0 +1,144 @@
 +/*
 + * libfdt - Flat Device Tree manipulation


@@ -21999,9 +21897,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/fdt_wip.c
 +      nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0), endoffset - nodeoffset);
 +      return 0;
 +}
 +      nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0), endoffset - nodeoffset);
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/libfdt.h powerpc.git/arch/powerpc/boot/libfdt/libfdt.h
---- linux-2.6.24/arch/powerpc/boot/libfdt/libfdt.h     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/libfdt.h      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt/libfdt.h

 @@ -0,0 +1,721 @@
 +#ifndef _LIBFDT_H
 +#define _LIBFDT_H
 @@ -0,0 +1,721 @@
 +#ifndef _LIBFDT_H
 +#define _LIBFDT_H


@@ -22724,9 +22621,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/libfdt.h p
 +const char *fdt_strerror(int errval);
 +
 +#endif /* _LIBFDT_H */
 +const char *fdt_strerror(int errval);
 +
 +#endif /* _LIBFDT_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/libfdt_internal.h powerpc.git/arch/powerpc/boot/libfdt/libfdt_internal.h
---- linux-2.6.24/arch/powerpc/boot/libfdt/libfdt_internal.h    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt/libfdt_internal.h     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt/libfdt_internal.h

 @@ -0,0 +1,89 @@
 +#ifndef _LIBFDT_INTERNAL_H
 +#define _LIBFDT_INTERNAL_H
 @@ -0,0 +1,89 @@
 +#ifndef _LIBFDT_INTERNAL_H
 +#define _LIBFDT_INTERNAL_H


@@ -22817,9 +22713,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt/libfdt_int
 +#define SW_MAGIC              (~FDT_MAGIC)
 +
 +#endif /* _LIBFDT_INTERNAL_H */
 +#define SW_MAGIC              (~FDT_MAGIC)
 +
 +#endif /* _LIBFDT_INTERNAL_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt-wrapper.c powerpc.git/arch/powerpc/boot/libfdt-wrapper.c
---- linux-2.6.24/arch/powerpc/boot/libfdt-wrapper.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt-wrapper.c     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt-wrapper.c

 @@ -0,0 +1,184 @@
 +/*
 + * This file does the necessary interface mapping between the bootwrapper
 @@ -0,0 +1,184 @@
 +/*
 + * This file does the necessary interface mapping between the bootwrapper


@@ -23005,9 +22900,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt-wrapper.c
 +      if (buf)
 +              fdt = buf;
 +}
 +      if (buf)
 +              fdt = buf;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt_env.h powerpc.git/arch/powerpc/boot/libfdt_env.h
---- linux-2.6.24/arch/powerpc/boot/libfdt_env.h        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/libfdt_env.h 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/libfdt_env.h

 @@ -0,0 +1,17 @@
 +#ifndef _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
 +#define _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
 @@ -0,0 +1,17 @@
 +#ifndef _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
 +#define _ARCH_POWERPC_BOOT_LIBFDT_ENV_H


@@ -23026,9 +22920,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/libfdt_env.h powe
 +#define cpu_to_fdt64(x)               (x)
 +
 +#endif /* _ARCH_POWERPC_BOOT_LIBFDT_ENV_H */
 +#define cpu_to_fdt64(x)               (x)
 +
 +#endif /* _ARCH_POWERPC_BOOT_LIBFDT_ENV_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/main.c powerpc.git/arch/powerpc/boot/main.c
---- linux-2.6.24/arch/powerpc/boot/main.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/main.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/main.c
++++ b/arch/powerpc/boot/main.c

 @@ -16,7 +16,6 @@
  #include "stdio.h"
  #include "ops.h"
 @@ -16,7 +16,6 @@
  #include "stdio.h"
  #include "ops.h"


@@ -23037,9 +22930,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/main.c powerpc.gi
  #include "reg.h"
  
  static struct gunzip_state gzstate;
  #include "reg.h"
  
  static struct gunzip_state gzstate;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ops.h powerpc.git/arch/powerpc/boot/ops.h
---- linux-2.6.24/arch/powerpc/boot/ops.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ops.h        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/ops.h
++++ b/arch/powerpc/boot/ops.h

 @@ -79,7 +79,7 @@
  extern struct loader_info loader_info;
  
 @@ -79,7 +79,7 @@
  extern struct loader_info loader_info;
  


@@ -23073,9 +22965,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ops.h powerpc.git
  void dt_fixup_mac_address(u32 index, const u8 *addr);
  void __dt_fixup_mac_addresses(u32 startindex, ...);
  #define dt_fixup_mac_addresses(...) \
  void dt_fixup_mac_address(u32 index, const u8 *addr);
  void __dt_fixup_mac_addresses(u32 startindex, ...);
  #define dt_fixup_mac_addresses(...) \

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/prpmc2800.c powerpc.git/arch/powerpc/boot/prpmc2800.c
---- linux-2.6.24/arch/powerpc/boot/prpmc2800.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/prpmc2800.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/prpmc2800.c
++++ b/arch/powerpc/boot/prpmc2800.c

 @@ -547,8 +547,7 @@
        if (!dtb)
                exit();
 @@ -547,8 +547,7 @@
        if (!dtb)
                exit();


@@ -23086,9 +22977,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/prpmc2800.c power
  
        bridge_base = mv64x60_get_bridge_base();
  
  
        bridge_base = mv64x60_get_bridge_base();
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ps3.c powerpc.git/arch/powerpc/boot/ps3.c
---- linux-2.6.24/arch/powerpc/boot/ps3.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/ps3.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/ps3.c
++++ b/arch/powerpc/boot/ps3.c

 @@ -131,7 +131,7 @@
        printf("\n-- PS3 bootwrapper --\n");
  
 @@ -131,7 +131,7 @@
        printf("\n-- PS3 bootwrapper --\n");
  


@@ -23098,9 +22988,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/ps3.c powerpc.git
  
        chosen = finddevice("/chosen");
  
  
        chosen = finddevice("/chosen");
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/redboot-8xx.c powerpc.git/arch/powerpc/boot/redboot-8xx.c
---- linux-2.6.24/arch/powerpc/boot/redboot-8xx.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/redboot-8xx.c        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/redboot-8xx.c

 @@ -0,0 +1,58 @@
 +/*
 + * RedBoot firmware support
 @@ -0,0 +1,58 @@
 +/*
 + * RedBoot firmware support


@@ -23160,9 +23049,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/redboot-8xx.c pow
 +      loader_info.cmdline = (char *)bd.bi_cmdline;
 +      loader_info.cmdline_len = strlen((char *)bd.bi_cmdline);
 +}
 +      loader_info.cmdline = (char *)bd.bi_cmdline;
 +      loader_info.cmdline_len = strlen((char *)bd.bi_cmdline);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/redboot.h powerpc.git/arch/powerpc/boot/redboot.h
---- linux-2.6.24/arch/powerpc/boot/redboot.h   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/redboot.h    2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/boot/redboot.h

 @@ -0,0 +1,56 @@
 +#ifndef _PPC_REDBOOT_H
 +#define _PPC_REDBOOT_H
 @@ -0,0 +1,56 @@
 +#ifndef _PPC_REDBOOT_H
 +#define _PPC_REDBOOT_H


@@ -23220,9 +23108,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/redboot.h powerpc
 +#define bi_pci_busfreq bi_pci_freq
 +#define bi_immr_base   bi_immr
 +#endif
 +#define bi_pci_busfreq bi_pci_freq
 +#define bi_immr_base   bi_immr
 +#endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/reg.h powerpc.git/arch/powerpc/boot/reg.h
---- linux-2.6.24/arch/powerpc/boot/reg.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/reg.h        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/reg.h
++++ b/arch/powerpc/boot/reg.h

 @@ -16,6 +16,14 @@
        return pvr;
  }
 @@ -16,6 +16,14 @@
        return pvr;
  }


@@ -23238,9 +23125,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/reg.h powerpc.git
  register void *__stack_pointer asm("r1");
  #define get_sp()      (__stack_pointer)
  
  register void *__stack_pointer asm("r1");
  #define get_sp()      (__stack_pointer)
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/serial.c powerpc.git/arch/powerpc/boot/serial.c
---- linux-2.6.24/arch/powerpc/boot/serial.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/serial.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/serial.c
++++ b/arch/powerpc/boot/serial.c

 @@ -128,7 +128,8 @@
                rc = cpm_console_init(devp, &serial_cd);
        else if (dt_is_compatible(devp, "mpc5200-psc-uart"))
 @@ -128,7 +128,8 @@
                rc = cpm_console_init(devp, &serial_cd);
        else if (dt_is_compatible(devp, "mpc5200-psc-uart"))


@@ -23251,9 +23137,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/serial.c powerpc.
                rc = uartlite_console_init(devp, &serial_cd);
  
        /* Add other serial console driver calls here */
                rc = uartlite_console_init(devp, &serial_cd);
  
        /* Add other serial console driver calls here */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/treeboot-walnut.c powerpc.git/arch/powerpc/boot/treeboot-walnut.c
---- linux-2.6.24/arch/powerpc/boot/treeboot-walnut.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/treeboot-walnut.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/treeboot-walnut.c
++++ b/arch/powerpc/boot/treeboot-walnut.c

 @@ -20,55 +20,6 @@
  
  BSS_STACK(4096);
 @@ -20,55 +20,6 @@
  
  BSS_STACK(4096);


@@ -23327,9 +23212,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/treeboot-walnut.c
 +      fdt_init(_dtb_start);
        serial_console_init();
  }
 +      fdt_init(_dtb_start);
        serial_console_init();
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.git/arch/powerpc/boot/wrapper
---- linux-2.6.24/arch/powerpc/boot/wrapper     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/boot/wrapper      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/boot/wrapper
++++ b/arch/powerpc/boot/wrapper

 @@ -45,6 +45,7 @@
  
  # directory for object and other files used by this script
 @@ -45,6 +45,7 @@
  
  # directory for object and other files used by this script


@@ -23412,9 +23296,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/boot/wrapper powerpc.g
 +    gzip --force -9 --stdout "$ofile.bin" > "$odir/otheros.bld"
      ;;
  esac
 +    gzip --force -9 --stdout "$ofile.bin" > "$odir/otheros.bld"
      ;;
  esac

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/adder875-redboot_defconfig powerpc.git/arch/powerpc/configs/adder875-redboot_defconfig
---- linux-2.6.24/arch/powerpc/configs/adder875-redboot_defconfig       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/adder875-redboot_defconfig        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/adder875-redboot_defconfig

 @@ -0,0 +1,798 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,798 @@
 +#
 +# Automatically generated make config: don't edit


@@ -24214,9 +24097,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/adder875-redbo
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/adder875-uboot_defconfig powerpc.git/arch/powerpc/configs/adder875-uboot_defconfig
---- linux-2.6.24/arch/powerpc/configs/adder875-uboot_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/adder875-uboot_defconfig  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/adder875-uboot_defconfig

 @@ -0,0 +1,798 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,798 @@
 +#
 +# Automatically generated make config: don't edit


@@ -25016,9 +24898,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/adder875-uboot
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/bamboo_defconfig powerpc.git/arch/powerpc/configs/bamboo_defconfig
---- linux-2.6.24/arch/powerpc/configs/bamboo_defconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/bamboo_defconfig  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/bamboo_defconfig
++++ b/arch/powerpc/configs/bamboo_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -25079,9 +24960,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/bamboo_defconf
  
  #
  # Security options
  
  #
  # Security options

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/celleb_defconfig powerpc.git/arch/powerpc/configs/celleb_defconfig
---- linux-2.6.24/arch/powerpc/configs/celleb_defconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/celleb_defconfig  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/celleb_defconfig
++++ b/arch/powerpc/configs/celleb_defconfig

 @@ -50,7 +50,8 @@
  CONFIG_GENERIC_BUG=y
  # CONFIG_DEFAULT_UIMAGE is not set
 @@ -50,7 +50,8 @@
  CONFIG_GENERIC_BUG=y
  # CONFIG_DEFAULT_UIMAGE is not set


@@ -25174,9 +25054,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/celleb_defconf
  
  #
  # Security options
  
  #
  # Security options

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ebony_defconfig powerpc.git/arch/powerpc/configs/ebony_defconfig
---- linux-2.6.24/arch/powerpc/configs/ebony_defconfig  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ebony_defconfig   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/ebony_defconfig
++++ b/arch/powerpc/configs/ebony_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -25205,9 +25084,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ebony_defconfi
  CONFIG_440GP=y
  # CONFIG_MPIC is not set
  # CONFIG_MPIC_WEIRD is not set
  CONFIG_440GP=y
  # CONFIG_MPIC is not set
  # CONFIG_MPIC_WEIRD is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ep405_defconfig powerpc.git/arch/powerpc/configs/ep405_defconfig
---- linux-2.6.24/arch/powerpc/configs/ep405_defconfig  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ep405_defconfig   2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/ep405_defconfig

 @@ -0,0 +1,952 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,952 @@
 +#
 +# Automatically generated make config: don't edit


@@ -26161,9 +26039,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ep405_defconfi
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ep8248e_defconfig powerpc.git/arch/powerpc/configs/ep8248e_defconfig
---- linux-2.6.24/arch/powerpc/configs/ep8248e_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ep8248e_defconfig 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/ep8248e_defconfig

 @@ -0,0 +1,821 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,821 @@
 +#
 +# Automatically generated make config: don't edit


@@ -26986,9 +26863,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ep8248e_defcon
 +# CONFIG_CRYPTO_HW is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y
 +# CONFIG_CRYPTO_HW is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/katmai_defconfig powerpc.git/arch/powerpc/configs/katmai_defconfig
---- linux-2.6.24/arch/powerpc/configs/katmai_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/katmai_defconfig  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/katmai_defconfig

 @@ -0,0 +1,790 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,790 @@
 +#
 +# Automatically generated make config: don't edit


@@ -27780,9 +27656,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/katmai_defconf
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defconfig powerpc.git/arch/powerpc/configs/kilauea_defconfig
---- linux-2.6.24/arch/powerpc/configs/kilauea_defconfig        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/kilauea_defconfig 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/kilauea_defconfig
++++ b/arch/powerpc/configs/kilauea_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -27977,9 +27852,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/kilauea_defcon
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set
  
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/lite5200_defconfig powerpc.git/arch/powerpc/configs/lite5200_defconfig
---- linux-2.6.24/arch/powerpc/configs/lite5200_defconfig       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/lite5200_defconfig        1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/configs/lite5200_defconfig
++++ /dev/null

 @@ -1,847 +0,0 @@
 -#
 -# Automatically generated make config: don't edit
 @@ -1,847 +0,0 @@
 -#
 -# Automatically generated make config: don't edit


@@ -28828,9 +28702,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/lite5200_defco
 -# CONFIG_CRYPTO is not set
 -CONFIG_PPC_CLOCK=y
 -CONFIG_PPC_LIB_RHEAP=y
 -# CONFIG_CRYPTO is not set
 -CONFIG_PPC_CLOCK=y
 -CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/makalu_defconfig powerpc.git/arch/powerpc/configs/makalu_defconfig
---- linux-2.6.24/arch/powerpc/configs/makalu_defconfig 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/makalu_defconfig  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/makalu_defconfig

 @@ -0,0 +1,812 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,812 @@
 +#
 +# Automatically generated make config: don't edit


@@ -29644,9 +29517,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/makalu_defconf
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc5200_defconfig powerpc.git/arch/powerpc/configs/mpc5200_defconfig
---- linux-2.6.24/arch/powerpc/configs/mpc5200_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/mpc5200_defconfig 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/mpc5200_defconfig

 @@ -0,0 +1,1286 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1286 @@
 +#
 +# Automatically generated make config: don't edit


@@ -30934,9 +30806,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc5200_defcon
 +CONFIG_CRYPTO_HW=y
 +CONFIG_PPC_CLOCK=y
 +CONFIG_PPC_LIB_RHEAP=y
 +CONFIG_CRYPTO_HW=y
 +CONFIG_PPC_CLOCK=y
 +CONFIG_PPC_LIB_RHEAP=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_defconfig powerpc.git/arch/powerpc/configs/mpc8313_rdb_defconfig
---- linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_defconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/mpc8313_rdb_defconfig     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/mpc8313_rdb_defconfig
++++ b/arch/powerpc/configs/mpc8313_rdb_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -31036,9 +30907,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8313_rdb_de
  CONFIG_PLIST=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y
  CONFIG_PLIST=y
  CONFIG_HAS_IOMEM=y
  CONFIG_HAS_IOPORT=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc834x_itx_defconfig powerpc.git/arch/powerpc/configs/mpc834x_itx_defconfig
---- linux-2.6.24/arch/powerpc/configs/mpc834x_itx_defconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/mpc834x_itx_defconfig     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/mpc834x_itx_defconfig
++++ b/arch/powerpc/configs/mpc834x_itx_defconfig

 @@ -570,7 +570,8 @@
  # CONFIG_PATA_SIS is not set
  # CONFIG_PATA_VIA is not set
 @@ -570,7 +570,8 @@
  # CONFIG_PATA_SIS is not set
  # CONFIG_PATA_VIA is not set


@@ -31049,9 +30919,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc834x_itx_de
  CONFIG_MD=y
  CONFIG_BLK_DEV_MD=y
  CONFIG_MD_LINEAR=y
  CONFIG_MD=y
  CONFIG_BLK_DEV_MD=y
  CONFIG_MD_LINEAR=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc837x_mds_defconfig powerpc.git/arch/powerpc/configs/mpc837x_mds_defconfig
---- linux-2.6.24/arch/powerpc/configs/mpc837x_mds_defconfig    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/mpc837x_mds_defconfig     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/mpc837x_mds_defconfig

 @@ -0,0 +1,878 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,878 @@
 +#
 +# Automatically generated make config: don't edit


@@ -31931,9 +31800,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc837x_mds_de
 +# CONFIG_CRYPTO_CAMELLIA is not set
 +# CONFIG_CRYPTO_TEST is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_CRYPTO_CAMELLIA is not set
 +# CONFIG_CRYPTO_TEST is not set
 +CONFIG_CRYPTO_HW=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8610_hpcd_defconfig powerpc.git/arch/powerpc/configs/mpc8610_hpcd_defconfig
---- linux-2.6.24/arch/powerpc/configs/mpc8610_hpcd_defconfig   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/mpc8610_hpcd_defconfig    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/mpc8610_hpcd_defconfig
++++ b/arch/powerpc/configs/mpc8610_hpcd_defconfig

 @@ -696,7 +696,7 @@
  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y
 @@ -696,7 +696,7 @@
  CONFIG_SERIAL_CORE=y
  CONFIG_SERIAL_CORE_CONSOLE=y


@@ -32126,9 +31994,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/mpc8610_hpcd_d
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=y
  # CONFIG_HID_DEBUG is not set
  CONFIG_HID_SUPPORT=y
  CONFIG_HID=y
  # CONFIG_HID_DEBUG is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/pasemi_defconfig powerpc.git/arch/powerpc/configs/pasemi_defconfig
---- linux-2.6.24/arch/powerpc/configs/pasemi_defconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/pasemi_defconfig  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/pasemi_defconfig
++++ b/arch/powerpc/configs/pasemi_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -32195,9 +32062,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/pasemi_defconf
  CONFIG_CRYPTO=y
  CONFIG_CRYPTO_ALGAPI=y
  CONFIG_CRYPTO_BLKCIPHER=y
  CONFIG_CRYPTO=y
  CONFIG_CRYPTO_ALGAPI=y
  CONFIG_CRYPTO_BLKCIPHER=y

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ppc64_defconfig powerpc.git/arch/powerpc/configs/ppc64_defconfig
---- linux-2.6.24/arch/powerpc/configs/ppc64_defconfig  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ppc64_defconfig   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/ppc64_defconfig
++++ b/arch/powerpc/configs/ppc64_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -32241,9 +32107,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ppc64_defconfi
  # CONFIG_INFINIBAND_AMSO1100 is not set
  # CONFIG_MLX4_INFINIBAND is not set
  CONFIG_INFINIBAND_IPOIB=m
  # CONFIG_INFINIBAND_AMSO1100 is not set
  # CONFIG_MLX4_INFINIBAND is not set
  CONFIG_INFINIBAND_IPOIB=m

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig powerpc.git/arch/powerpc/configs/ps3_defconfig
---- linux-2.6.24/arch/powerpc/configs/ps3_defconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/ps3_defconfig     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/ps3_defconfig
++++ b/arch/powerpc/configs/ps3_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -32378,9 +32243,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/ps3_defconfig
  # CONFIG_KPROBES is not set
  # CONFIG_MARKERS is not set
  
  # CONFIG_KPROBES is not set
  # CONFIG_MARKERS is not set
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/rainier_defconfig powerpc.git/arch/powerpc/configs/rainier_defconfig
---- linux-2.6.24/arch/powerpc/configs/rainier_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/rainier_defconfig 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/rainier_defconfig

 @@ -0,0 +1,873 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,873 @@
 +#
 +# Automatically generated make config: don't edit


@@ -33255,9 +33119,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/rainier_defcon
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/sequoia_defconfig powerpc.git/arch/powerpc/configs/sequoia_defconfig
---- linux-2.6.24/arch/powerpc/configs/sequoia_defconfig        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/sequoia_defconfig 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/sequoia_defconfig
++++ b/arch/powerpc/configs/sequoia_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -33337,9 +33200,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/sequoia_defcon
  # CONFIG_PPC_EARLY_DEBUG_CPM is not set
  CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
  CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1
  # CONFIG_PPC_EARLY_DEBUG_CPM is not set
  CONFIG_PPC_EARLY_DEBUG_44x_PHYSLOW=0xef600300
  CONFIG_PPC_EARLY_DEBUG_44x_PHYSHIGH=0x1

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/storcenter_defconfig powerpc.git/arch/powerpc/configs/storcenter_defconfig
---- linux-2.6.24/arch/powerpc/configs/storcenter_defconfig     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/storcenter_defconfig      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/storcenter_defconfig

 @@ -0,0 +1,1174 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1174 @@
 +#
 +# Automatically generated make config: don't edit


@@ -34515,9 +34377,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/storcenter_def
 +CONFIG_ASYNC_XOR=y
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +CONFIG_ASYNC_XOR=y
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/taishan_defconfig powerpc.git/arch/powerpc/configs/taishan_defconfig
---- linux-2.6.24/arch/powerpc/configs/taishan_defconfig        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/taishan_defconfig 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/taishan_defconfig

 @@ -0,0 +1,790 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,790 @@
 +#
 +# Automatically generated make config: don't edit


@@ -35309,9 +35170,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/taishan_defcon
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_CRYPTO_AUTHENC is not set
 +CONFIG_CRYPTO_HW=y
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconfig powerpc.git/arch/powerpc/configs/walnut_defconfig
---- linux-2.6.24/arch/powerpc/configs/walnut_defconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/walnut_defconfig  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/configs/walnut_defconfig
++++ b/arch/powerpc/configs/walnut_defconfig

 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit
 @@ -1,7 +1,7 @@
  #
  # Automatically generated make config: don't edit


@@ -35550,9 +35410,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/walnut_defconf
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set
  
  # CONFIG_EDAC is not set
  # CONFIG_RTC_CLASS is not set
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/warp_defconfig powerpc.git/arch/powerpc/configs/warp_defconfig
---- linux-2.6.24/arch/powerpc/configs/warp_defconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/configs/warp_defconfig    2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/configs/warp_defconfig

 @@ -0,0 +1,1057 @@
 +#
 +# Automatically generated make config: don't edit
 @@ -0,0 +1,1057 @@
 +#
 +# Automatically generated make config: don't edit


@@ -36611,9 +36470,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/configs/warp_defconfig
 +# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set
 +# CONFIG_SECURITY_FILE_CAPABILITIES is not set
 +# CONFIG_CRYPTO is not set
 +# CONFIG_PPC_CLOCK is not set

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/Makefile powerpc.git/arch/powerpc/kernel/Makefile
---- linux-2.6.24/arch/powerpc/kernel/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/Makefile   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/Makefile
++++ b/arch/powerpc/kernel/Makefile

 @@ -3,7 +3,7 @@
  #
  
 @@ -3,7 +3,7 @@
  #
  


@@ -36645,9 +36503,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/Makefile powerp
 +PHONY += systbl_chk
 +systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
 +      $(call cmd,systbl_chk)
 +PHONY += systbl_chk
 +systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
 +      $(call cmd,systbl_chk)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/btext.c powerpc.git/arch/powerpc/kernel/btext.c
---- linux-2.6.24/arch/powerpc/kernel/btext.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/btext.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/btext.c
++++ b/arch/powerpc/kernel/btext.c

 @@ -236,7 +236,7 @@
        if (rc == 0 || !allow_nonstdout)
                return rc;
 @@ -236,7 +236,7 @@
        if (rc == 0 || !allow_nonstdout)
                return rc;


@@ -36657,9 +36514,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/btext.c powerpc
                if (of_get_property(np, "linux,opened", NULL)) {
                        printk("trying %s ...\n", np->full_name);
                        rc = btext_initialize(np);
                if (of_get_property(np, "linux,opened", NULL)) {
                        printk("trying %s ...\n", np->full_name);
                        rc = btext_initialize(np);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cpu_setup_44x.S powerpc.git/arch/powerpc/kernel/cpu_setup_44x.S
---- linux-2.6.24/arch/powerpc/kernel/cpu_setup_44x.S   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/cpu_setup_44x.S    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/cpu_setup_44x.S
++++ b/arch/powerpc/kernel/cpu_setup_44x.S

 @@ -23,11 +23,24 @@
        mflr    r4
        bl      __init_fpu_44x
 @@ -23,11 +23,24 @@
        mflr    r4
        bl      __init_fpu_44x


@@ -36686,9 +36542,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cpu_setup_44x.S
  
  /* enable APU between CPU and FPU */
  _GLOBAL(__init_fpu_44x)
  
  /* enable APU between CPU and FPU */
  _GLOBAL(__init_fpu_44x)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powerpc.git/arch/powerpc/kernel/cputable.c
---- linux-2.6.24/arch/powerpc/kernel/cputable.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/cputable.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/cputable.c
++++ b/arch/powerpc/kernel/cputable.c

 @@ -33,7 +33,9 @@
  #ifdef CONFIG_PPC32
  extern void __setup_cpu_440ep(unsigned long offset, struct cpu_spec* spec);
 @@ -33,7 +33,9 @@
  #ifdef CONFIG_PPC32
  extern void __setup_cpu_440ep(unsigned long offset, struct cpu_spec* spec);


@@ -37538,9 +37393,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/cputable.c powe
  #if !CLASSIC_PPC
        {       /* default match */
                .pvr_mask               = 0x00000000,
  #if !CLASSIC_PPC
        {       /* default match */
                .pvr_mask               = 0x00000000,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/crash.c powerpc.git/arch/powerpc/kernel/crash.c
---- linux-2.6.24/arch/powerpc/kernel/crash.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/crash.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/crash.c
++++ b/arch/powerpc/kernel/crash.c

 @@ -32,6 +32,8 @@
  #include <asm/lmb.h>
  #include <asm/firmware.h>
 @@ -32,6 +32,8 @@
  #include <asm/lmb.h>
  #include <asm/firmware.h>


@@ -37677,9 +37531,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/crash.c powerpc
  
        /*
         * Make a note of crashing cpu. Will be used in machine_kexec
  
        /*
         * Make a note of crashing cpu. Will be used in machine_kexec

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/dma_64.c powerpc.git/arch/powerpc/kernel/dma_64.c
---- linux-2.6.24/arch/powerpc/kernel/dma_64.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/dma_64.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/dma_64.c
++++ b/arch/powerpc/kernel/dma_64.c

 @@ -112,10 +112,16 @@
  /*
   * Generic direct DMA implementation
 @@ -112,10 +112,16 @@
  /*
   * Generic direct DMA implementation


@@ -37733,9 +37586,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/dma_64.c powerp
                sg->dma_length = sg->length;
        }
  
                sg->dma_length = sg->length;
        }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_44x.S powerpc.git/arch/powerpc/kernel/head_44x.S
---- linux-2.6.24/arch/powerpc/kernel/head_44x.S        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/head_44x.S 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/head_44x.S
++++ b/arch/powerpc/kernel/head_44x.S

 @@ -289,11 +289,8 @@
        CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception)
  
 @@ -289,11 +289,8 @@
        CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception)
  


@@ -37765,9 +37617,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_44x.S powe
   * extern void giveup_altivec(struct task_struct *prev)
   *
   * The 44x core does not have an AltiVec unit.
   * extern void giveup_altivec(struct task_struct *prev)
   *
   * The 44x core does not have an AltiVec unit.

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_booke.h powerpc.git/arch/powerpc/kernel/head_booke.h
---- linux-2.6.24/arch/powerpc/kernel/head_booke.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/head_booke.h       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/head_booke.h
++++ b/arch/powerpc/kernel/head_booke.h

 @@ -166,7 +166,7 @@
        mfspr   r5,SPRN_ESR;                                    \
        stw     r5,_ESR(r11);                                   \
 @@ -166,7 +166,7 @@
        mfspr   r5,SPRN_ESR;                                    \
        stw     r5,_ESR(r11);                                   \


@@ -37777,9 +37628,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_booke.h po
                          NOCOPY, mcheck_transfer_to_handler,   \
                          ret_from_mcheck_exc)
  
                          NOCOPY, mcheck_transfer_to_handler,   \
                          ret_from_mcheck_exc)
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_fsl_booke.S powerpc.git/arch/powerpc/kernel/head_fsl_booke.S
---- linux-2.6.24/arch/powerpc/kernel/head_fsl_booke.S  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/head_fsl_booke.S   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/head_fsl_booke.S
++++ b/arch/powerpc/kernel/head_fsl_booke.S

 @@ -73,8 +73,8 @@
  /* We try to not make any assumptions about how the boot loader
   * setup or used the TLBs.  We invalidate all mappings from the
 @@ -73,8 +73,8 @@
  /* We try to not make any assumptions about how the boot loader
   * setup or used the TLBs.  We invalidate all mappings from the


@@ -37839,9 +37689,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/head_fsl_booke.
        lis     r7,MSR_KERNEL@h
        ori     r7,r7,MSR_KERNEL@l
        bl      1f                      /* Find our address */
        lis     r7,MSR_KERNEL@h
        ori     r7,r7,MSR_KERNEL@l
        bl      1f                      /* Find our address */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ibmebus.c powerpc.git/arch/powerpc/kernel/ibmebus.c
---- linux-2.6.24/arch/powerpc/kernel/ibmebus.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/ibmebus.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/ibmebus.c
++++ b/arch/powerpc/kernel/ibmebus.c

 @@ -41,6 +41,7 @@
  #include <linux/kobject.h>
  #include <linux/dma-mapping.h>
 @@ -41,6 +41,7 @@
  #include <linux/kobject.h>
  #include <linux/dma-mapping.h>


@@ -37887,9 +37736,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ibmebus.c power
  }
  EXPORT_SYMBOL(ibmebus_unregister_driver);
  
  }
  EXPORT_SYMBOL(ibmebus_unregister_driver);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/iommu.c powerpc.git/arch/powerpc/kernel/iommu.c
---- linux-2.6.24/arch/powerpc/kernel/iommu.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/iommu.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/iommu.c
++++ b/arch/powerpc/kernel/iommu.c

 @@ -532,16 +532,14 @@
        return tbl;
  }
 @@ -532,16 +532,14 @@
        return tbl;
  }


@@ -37918,9 +37766,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/iommu.c powerpc
                        break;
                }
        }
                        break;
                }
        }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/isa-bridge.c powerpc.git/arch/powerpc/kernel/isa-bridge.c
---- linux-2.6.24/arch/powerpc/kernel/isa-bridge.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/isa-bridge.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/isa-bridge.c
++++ b/arch/powerpc/kernel/isa-bridge.c

 @@ -108,7 +108,7 @@
        if (size > 0x10000)
                size = 0x10000;
 @@ -108,7 +108,7 @@
        if (size > 0x10000)
                size = 0x10000;


@@ -37948,9 +37795,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/isa-bridge.c po
                                of_node_put(parent);
                                break;
                        }
                                of_node_put(parent);
                                break;
                        }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/legacy_serial.c powerpc.git/arch/powerpc/kernel/legacy_serial.c
---- linux-2.6.24/arch/powerpc/kernel/legacy_serial.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/legacy_serial.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/legacy_serial.c
++++ b/arch/powerpc/kernel/legacy_serial.c

 @@ -307,7 +307,7 @@
        }
  
 @@ -307,7 +307,7 @@
        }
  


@@ -37996,9 +37842,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/legacy_serial.c
         */
        DBG("Fixing serial ports interrupts and IO ports ...\n");
  
         */
        DBG("Fixing serial ports interrupts and IO ports ...\n");
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/lparcfg.c powerpc.git/arch/powerpc/kernel/lparcfg.c
---- linux-2.6.24/arch/powerpc/kernel/lparcfg.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/lparcfg.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/lparcfg.c
++++ b/arch/powerpc/kernel/lparcfg.c

 @@ -41,7 +41,6 @@
  /* #define LPARCFG_DEBUG */
  
 @@ -41,7 +41,6 @@
  /* #define LPARCFG_DEBUG */
  


@@ -38033,9 +37878,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/lparcfg.c power
  }
  
  module_init(lparcfg_init);
  }
  
  module_init(lparcfg_init);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc.S powerpc.git/arch/powerpc/kernel/misc.S
---- linux-2.6.24/arch/powerpc/kernel/misc.S    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/misc.S     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/misc.S
++++ b/arch/powerpc/kernel/misc.S

 @@ -8,12 +8,17 @@
   * Adapted for iSeries by Mike Corrigan (mikejc@us.ibm.com)
   * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com)
 @@ -8,12 +8,17 @@
   * Adapted for iSeries by Mike Corrigan (mikejc@us.ibm.com)
   * PPC64 updates by Dave Engebretsen (engebret@us.ibm.com)


@@ -38126,9 +37970,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc.S powerpc.
 +      mtlr    r0
 +      mr      r3,r4
 +      blr
 +      mtlr    r0
 +      mr      r3,r4
 +      blr

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc_32.S powerpc.git/arch/powerpc/kernel/misc_32.S
---- linux-2.6.24/arch/powerpc/kernel/misc_32.S 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/misc_32.S  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/misc_32.S
++++ b/arch/powerpc/kernel/misc_32.S

 @@ -206,6 +206,45 @@
        isync
        blr                     /* Done */
 @@ -206,6 +206,45 @@
        isync
        blr                     /* Done */


@@ -38189,9 +38032,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc_32.S power
  /*
   * This routine is just here to keep GCC happy - sigh...
   */
  /*
   * This routine is just here to keep GCC happy - sigh...
   */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc_64.S powerpc.git/arch/powerpc/kernel/misc_64.S
---- linux-2.6.24/arch/powerpc/kernel/misc_64.S 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/misc_64.S  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/misc_64.S
++++ b/arch/powerpc/kernel/misc_64.S

 @@ -518,13 +518,6 @@
  
  #endif /* CONFIG_ALTIVEC */
 @@ -518,13 +518,6 @@
  
  #endif /* CONFIG_ALTIVEC */


@@ -38206,9 +38048,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/misc_64.S power
  /* kexec_wait(phys_cpu)
   *
   * wait for the flag to change, indicating this kernel is going away but
  /* kexec_wait(phys_cpu)
   *
   * wait for the flag to change, indicating this kernel is going away but

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_32.c powerpc.git/arch/powerpc/kernel/module_32.c
---- linux-2.6.24/arch/powerpc/kernel/module_32.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/module_32.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/module_32.c
++++ b/arch/powerpc/kernel/module_32.c

 @@ -24,6 +24,7 @@
  #include <linux/kernel.h>
  #include <linux/cache.h>
 @@ -24,6 +24,7 @@
  #include <linux/kernel.h>
  #include <linux/cache.h>


@@ -38308,9 +38149,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_32.c pow
                        ret += count_relocs((void *)hdr
                                             + sechdrs[i].sh_offset,
                                             sechdrs[i].sh_size
                        ret += count_relocs((void *)hdr
                                             + sechdrs[i].sh_offset,
                                             sechdrs[i].sh_size

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_64.c powerpc.git/arch/powerpc/kernel/module_64.c
---- linux-2.6.24/arch/powerpc/kernel/module_64.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/module_64.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/module_64.c
++++ b/arch/powerpc/kernel/module_64.c

 @@ -24,6 +24,7 @@
  #include <asm/module.h>
  #include <asm/uaccess.h>
 @@ -24,6 +24,7 @@
  #include <asm/module.h>
  #include <asm/uaccess.h>


@@ -38438,9 +38278,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/module_64.c pow
                                = (*(uint32_t *)location & ~0x03fffffc)
                                | (value & 0x03fffffc);
                        break;
                                = (*(uint32_t *)location & ~0x03fffffc)
                                | (value & 0x03fffffc);
                        break;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_device.c powerpc.git/arch/powerpc/kernel/of_device.c
---- linux-2.6.24/arch/powerpc/kernel/of_device.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/of_device.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/of_device.c
++++ b/arch/powerpc/kernel/of_device.c

 @@ -5,10 +5,10 @@
  #include <linux/module.h>
  #include <linux/mod_devicetable.h>
 @@ -5,10 +5,10 @@
  #include <linux/module.h>
  #include <linux/mod_devicetable.h>


@@ -38453,9 +38292,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_device.c pow
  
  static void of_device_make_bus_id(struct of_device *dev)
  {
  
  static void of_device_make_bus_id(struct of_device *dev)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_platform.c powerpc.git/arch/powerpc/kernel/of_platform.c
---- linux-2.6.24/arch/powerpc/kernel/of_platform.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/of_platform.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/of_platform.c
++++ b/arch/powerpc/kernel/of_platform.c

 @@ -19,6 +19,7 @@
  #include <linux/mod_devicetable.h>
  #include <linux/slab.h>
 @@ -19,6 +19,7 @@
  #include <linux/mod_devicetable.h>
  #include <linux/slab.h>


@@ -38537,9 +38375,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/of_platform.c p
                if (!of_match_node(matches, child))
                        continue;
  
                if (!of_match_node(matches, child))
                        continue;
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci-common.c powerpc.git/arch/powerpc/kernel/pci-common.c
---- linux-2.6.24/arch/powerpc/kernel/pci-common.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/pci-common.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/pci-common.c
++++ b/arch/powerpc/kernel/pci-common.c

 @@ -48,32 +48,26 @@
  static DEFINE_SPINLOCK(hose_spinlock);
  
 @@ -48,32 +48,26 @@
  static DEFINE_SPINLOCK(hose_spinlock);
  


@@ -39365,9 +39202,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci-common.c po
 +      return 0;
 +}
 +
 +      return 0;
 +}
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerpc.git/arch/powerpc/kernel/pci_32.c
---- linux-2.6.24/arch/powerpc/kernel/pci_32.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/pci_32.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/pci_32.c
++++ b/arch/powerpc/kernel/pci_32.c

 @@ -13,6 +13,7 @@
  #include <linux/bootmem.h>
  #include <linux/irq.h>
 @@ -13,6 +13,7 @@
  #include <linux/bootmem.h>
  #include <linux/irq.h>


@@ -40508,9 +40344,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_32.c powerp
        hose = pci_bus_to_hose(bus);
        if (!hose)
                return -ENODEV;
        hose = pci_bus_to_hose(bus);
        if (!hose)
                return -ENODEV;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerpc.git/arch/powerpc/kernel/pci_64.c
---- linux-2.6.24/arch/powerpc/kernel/pci_64.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/pci_64.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/pci_64.c
++++ b/arch/powerpc/kernel/pci_64.c

 @@ -31,7 +31,6 @@
  #include <asm/byteorder.h>
  #include <asm/machdep.h>
 @@ -31,7 +31,6 @@
  #include <asm/byteorder.h>
  #include <asm/machdep.h>


@@ -41122,9 +40957,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_64.c powerp
  
  unsigned long pci_address_to_pio(phys_addr_t address)
  {
  
  unsigned long pci_address_to_pio(phys_addr_t address)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_dn.c powerpc.git/arch/powerpc/kernel/pci_dn.c
---- linux-2.6.24/arch/powerpc/kernel/pci_dn.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/pci_dn.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/pci_dn.c
++++ b/arch/powerpc/kernel/pci_dn.c

 @@ -56,11 +56,6 @@
                pdn->busno = (regs[0] >> 16) & 0xff;
                pdn->devfn = (regs[0] >> 8) & 0xff;
 @@ -56,11 +56,6 @@
                pdn->busno = (regs[0] >> 16) & 0xff;
                pdn->devfn = (regs[0] >> 8) & 0xff;


@@ -41146,9 +40980,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/pci_dn.c powerp
        struct pci_dn *pdn;
  
        /* PHB nodes themselves must not match */
        struct pci_dn *pdn;
  
        /* PHB nodes themselves must not match */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ppc_ksyms.c powerpc.git/arch/powerpc/kernel/ppc_ksyms.c
---- linux-2.6.24/arch/powerpc/kernel/ppc_ksyms.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/ppc_ksyms.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/ppc_ksyms.c
++++ b/arch/powerpc/kernel/ppc_ksyms.c

 @@ -59,6 +59,7 @@
  extern int sys_sigreturn(struct pt_regs *regs);
  
 @@ -59,6 +59,7 @@
  extern int sys_sigreturn(struct pt_regs *regs);
  


@@ -41157,9 +40990,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/ppc_ksyms.c pow
  EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
  EXPORT_SYMBOL(DMA_MODE_READ);
  EXPORT_SYMBOL(DMA_MODE_WRITE);
  EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
  EXPORT_SYMBOL(DMA_MODE_READ);
  EXPORT_SYMBOL(DMA_MODE_WRITE);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom.c powerpc.git/arch/powerpc/kernel/prom.c
---- linux-2.6.24/arch/powerpc/kernel/prom.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/prom.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/prom.c
++++ b/arch/powerpc/kernel/prom.c

 @@ -583,6 +583,20 @@
                      ibm_pa_features, ARRAY_SIZE(ibm_pa_features));
  }
 @@ -583,6 +583,20 @@
                      ibm_pa_features, ARRAY_SIZE(ibm_pa_features));
  }


@@ -41237,9 +41069,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom.c powerpc.
  
  #ifdef CONFIG_PPC_PSERIES
        if (nthreads > 1)
  
  #ifdef CONFIG_PPC_PSERIES
        if (nthreads > 1)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom_parse.c powerpc.git/arch/powerpc/kernel/prom_parse.c
---- linux-2.6.24/arch/powerpc/kernel/prom_parse.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/prom_parse.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/prom_parse.c
++++ b/arch/powerpc/kernel/prom_parse.c

 @@ -273,7 +273,7 @@
  #else
                        struct pci_controller *host;
 @@ -273,7 +273,7 @@
  #else
                        struct pci_controller *host;


@@ -41306,9 +41137,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/prom_parse.c po
  const u32 *of_get_address(struct device_node *dev, int index, u64 *size,
                    unsigned int *flags)
  {
  const u32 *of_get_address(struct device_node *dev, int index, u64 *size,
                    unsigned int *flags)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/rio.c powerpc.git/arch/powerpc/kernel/rio.c
---- linux-2.6.24/arch/powerpc/kernel/rio.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/rio.c      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/kernel/rio.c

 @@ -0,0 +1,52 @@
 +/*
 + * RapidIO PPC32 support
 @@ -0,0 +1,52 @@
 +/*
 + * RapidIO PPC32 support


@@ -41362,9 +41192,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/rio.c powerpc.g
 +}
 +
 +subsys_initcall(ppc_rio_init);
 +}
 +
 +subsys_initcall(ppc_rio_init);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/rtas_pci.c powerpc.git/arch/powerpc/kernel/rtas_pci.c
---- linux-2.6.24/arch/powerpc/kernel/rtas_pci.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/rtas_pci.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/rtas_pci.c
++++ b/arch/powerpc/kernel/rtas_pci.c

 @@ -260,7 +260,7 @@
  
  int __devinit rtas_setup_phb(struct pci_controller *phb)
 @@ -260,7 +260,7 @@
  
  int __devinit rtas_setup_phb(struct pci_controller *phb)


@@ -41401,9 +41230,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/rtas_pci.c powe
        }
  }
  
        }
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/setup-common.c powerpc.git/arch/powerpc/kernel/setup-common.c
---- linux-2.6.24/arch/powerpc/kernel/setup-common.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/setup-common.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/setup-common.c
++++ b/arch/powerpc/kernel/setup-common.c

 @@ -33,6 +33,7 @@
  #include <linux/serial.h>
  #include <linux/serial_8250.h>
 @@ -33,6 +33,7 @@
  #include <linux/serial.h>
  #include <linux/serial_8250.h>


@@ -41556,9 +41384,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/setup-common.c
  #endif /* CONFIG_PPC64 */
  }
  #endif /* CONFIG_SMP */
  #endif /* CONFIG_PPC64 */
  }
  #endif /* CONFIG_SMP */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/signal_32.c powerpc.git/arch/powerpc/kernel/signal_32.c
---- linux-2.6.24/arch/powerpc/kernel/signal_32.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/signal_32.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/signal_32.c
++++ b/arch/powerpc/kernel/signal_32.c

 @@ -24,13 +24,12 @@
  #include <linux/signal.h>
  #include <linux/errno.h>
 @@ -24,13 +24,12 @@
  #include <linux/signal.h>
  #include <linux/errno.h>


@@ -41574,9 +41401,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/signal_32.c pow
  #include <linux/unistd.h>
  #include <linux/stddef.h>
  #include <linux/tty.h>
  #include <linux/unistd.h>
  #include <linux/stddef.h>
  #include <linux/tty.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.git/arch/powerpc/kernel/smp.c
---- linux-2.6.24/arch/powerpc/kernel/smp.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/smp.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/smp.c
++++ b/arch/powerpc/kernel/smp.c

 @@ -76,6 +76,8 @@
  
  int smt_enabled_at_boot = 1;
 @@ -76,6 +76,8 @@
  
  int smt_enabled_at_boot = 1;


@@ -41692,9 +41518,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/smp.c powerpc.g
  }
  
  void smp_call_function_interrupt(void)
  }
  
  void smp_call_function_interrupt(void)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/systbl_chk.c powerpc.git/arch/powerpc/kernel/systbl_chk.c
---- linux-2.6.24/arch/powerpc/kernel/systbl_chk.c      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/systbl_chk.c       2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/kernel/systbl_chk.c

 @@ -0,0 +1,58 @@
 +/*
 + * This file, when run through CPP produces a list of syscall numbers
 @@ -0,0 +1,58 @@
 +/*
 + * This file, when run through CPP produces a list of syscall numbers


@@ -41754,9 +41579,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/systbl_chk.c po
 +START_TABLE
 +#include <asm/systbl.h>
 +END_TABLE __NR_syscalls
 +START_TABLE
 +#include <asm/systbl.h>
 +END_TABLE __NR_syscalls

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/systbl_chk.sh powerpc.git/arch/powerpc/kernel/systbl_chk.sh
---- linux-2.6.24/arch/powerpc/kernel/systbl_chk.sh     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/systbl_chk.sh      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/kernel/systbl_chk.sh

 @@ -0,0 +1,33 @@
 +#!/bin/sh
 +#
 @@ -0,0 +1,33 @@
 +#!/bin/sh
 +#


@@ -41791,9 +41615,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/systbl_chk.sh p
 +              };
 +              num++;
 +      }' "$1"
 +              };
 +              num++;
 +      }' "$1"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.git/arch/powerpc/kernel/time.c
---- linux-2.6.24/arch/powerpc/kernel/time.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/time.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/time.c
++++ b/arch/powerpc/kernel/time.c

 @@ -116,9 +116,12 @@
         .features       = CLOCK_EVT_FEAT_ONESHOT,
  };
 @@ -116,9 +116,12 @@
         .features       = CLOCK_EVT_FEAT_ONESHOT,
  };


@@ -41980,9 +41803,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/time.c powerpc.
  {
        int cpu = smp_processor_id();
  
  {
        int cpu = smp_processor_id();
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc.git/arch/powerpc/kernel/traps.c
---- linux-2.6.24/arch/powerpc/kernel/traps.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/traps.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/traps.c
++++ b/arch/powerpc/kernel/traps.c

 @@ -334,18 +334,25 @@
  #define clear_single_step(regs)       ((regs)->msr &= ~MSR_SE)
  #endif
 @@ -334,18 +334,25 @@
  #define clear_single_step(regs)       ((regs)->msr &= ~MSR_SE)
  #endif


@@ -42152,9 +41974,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/traps.c powerpc
        return -EINVAL;
  }
  
        return -EINVAL;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg.c powerpc.git/arch/powerpc/kernel/udbg.c
---- linux-2.6.24/arch/powerpc/kernel/udbg.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/udbg.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/udbg.c
++++ b/arch/powerpc/kernel/udbg.c

 @@ -54,9 +54,16 @@
  #elif defined(CONFIG_PPC_EARLY_DEBUG_44x)
        /* PPC44x debug */
 @@ -54,9 +54,16 @@
  #elif defined(CONFIG_PPC_EARLY_DEBUG_44x)
        /* PPC44x debug */


@@ -42172,9 +41993,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg.c powerpc.
  }
  
  /* udbg library, used by xmon et al */
  }
  
  /* udbg library, used by xmon et al */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg_16550.c powerpc.git/arch/powerpc/kernel/udbg_16550.c
---- linux-2.6.24/arch/powerpc/kernel/udbg_16550.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/kernel/udbg_16550.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/kernel/udbg_16550.c
++++ b/arch/powerpc/kernel/udbg_16550.c

 @@ -46,7 +46,7 @@
  
  #define LCR_DLAB 0x80
 @@ -46,7 +46,7 @@
  
  #define LCR_DLAB 0x80


@@ -42255,9 +42075,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/kernel/udbg_16550.c po
 +      udbg_getc_poll = NULL;
 +}
 +#endif /* CONFIG_PPC_EARLY_DEBUG_40x */
 +      udbg_getc_poll = NULL;
 +}
 +#endif /* CONFIG_PPC_EARLY_DEBUG_40x */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/math-emu/op-4.h powerpc.git/arch/powerpc/math-emu/op-4.h
---- linux-2.6.24/arch/powerpc/math-emu/op-4.h  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/math-emu/op-4.h   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/math-emu/op-4.h
++++ b/arch/powerpc/math-emu/op-4.h

 @@ -194,19 +194,39 @@
    (X##_f[3] = I3, X##_f[2] = I2, X##_f[1] = I1, X##_f[0] = I0)
  
 @@ -194,19 +194,39 @@
    (X##_f[3] = I3, X##_f[2] = I2, X##_f[1] = I1, X##_f[0] = I0)
  


@@ -42308,9 +42127,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/math-emu/op-4.h powerp
  #endif
  
  #ifndef __FP_FRAC_ADDI_4
  #endif
  
  #ifndef __FP_FRAC_ADDI_4

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/fault.c powerpc.git/arch/powerpc/mm/fault.c
---- linux-2.6.24/arch/powerpc/mm/fault.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/fault.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/mm/fault.c
++++ b/arch/powerpc/mm/fault.c

 @@ -167,10 +167,8 @@
        if (notify_page_fault(regs))
                return 0;
 @@ -167,10 +167,8 @@
        if (notify_page_fault(regs))
                return 0;


@@ -42333,9 +42151,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/fault.c powerpc.git
                       "in_atomic() = %d mm = %p\n", in_atomic(), mm);
                printk(KERN_EMERG "NIP = %lx  MSR = %lx\n",
                       regs->nip, regs->msr);
                       "in_atomic() = %d mm = %p\n", in_atomic(), mm);
                printk(KERN_EMERG "NIP = %lx  MSR = %lx\n",
                       regs->nip, regs->msr);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/fsl_booke_mmu.c powerpc.git/arch/powerpc/mm/fsl_booke_mmu.c
---- linux-2.6.24/arch/powerpc/mm/fsl_booke_mmu.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/fsl_booke_mmu.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/mm/fsl_booke_mmu.c
++++ b/arch/powerpc/mm/fsl_booke_mmu.c

 @@ -165,15 +165,15 @@
  void __init cam_mapin_ram(unsigned long cam0, unsigned long cam1,
                unsigned long cam2)
 @@ -165,15 +165,15 @@
  void __init cam_mapin_ram(unsigned long cam0, unsigned long cam1,
                unsigned long cam2)


@@ -42355,9 +42172,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/fsl_booke_mmu.c pow
        }
  }
  
        }
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hash_utils_64.c powerpc.git/arch/powerpc/mm/hash_utils_64.c
---- linux-2.6.24/arch/powerpc/mm/hash_utils_64.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/hash_utils_64.c        2008-01-28 21:37:04.000000000 +0100
+--- a/arch/powerpc/mm/hash_utils_64.c
++++ b/arch/powerpc/mm/hash_utils_64.c

 @@ -96,6 +96,7 @@
  int mmu_io_psize = MMU_PAGE_4K;
  int mmu_kernel_ssize = MMU_SEGSIZE_256M;
 @@ -96,6 +96,7 @@
  int mmu_io_psize = MMU_PAGE_4K;
  int mmu_kernel_ssize = MMU_SEGSIZE_256M;


@@ -42387,9 +42203,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hash_utils_64.c pow
  #endif /* CONFIG_HUGETLB_PAGE */
  }
  
  #endif /* CONFIG_HUGETLB_PAGE */
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c powerpc.git/arch/powerpc/mm/hugetlbpage.c
---- linux-2.6.24/arch/powerpc/mm/hugetlbpage.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/hugetlbpage.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/mm/hugetlbpage.c
++++ b/arch/powerpc/mm/hugetlbpage.c

 @@ -24,18 +24,17 @@
  #include <asm/cputable.h>
  #include <asm/spu.h>
 @@ -24,18 +24,17 @@
  #include <asm/cputable.h>
  #include <asm/spu.h>


@@ -42585,9 +42400,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/hugetlbpage.c power
  static void zero_ctor(struct kmem_cache *cache, void *addr)
  {
        memset(addr, 0, kmem_cache_size(cache));
  static void zero_ctor(struct kmem_cache *cache, void *addr)
  {
        memset(addr, 0, kmem_cache_size(cache));

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/lmb.c powerpc.git/arch/powerpc/mm/lmb.c
---- linux-2.6.24/arch/powerpc/mm/lmb.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/lmb.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/mm/lmb.c
++++ b/arch/powerpc/mm/lmb.c

 @@ -342,3 +342,16 @@
                }
        }
 @@ -342,3 +342,16 @@
                }
        }


@@ -42605,9 +42419,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/lmb.c powerpc.git/a
 +      }
 +      return 0;
 +}
 +      }
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/mem.c powerpc.git/arch/powerpc/mm/mem.c
---- linux-2.6.24/arch/powerpc/mm/mem.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/mem.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/mm/mem.c
++++ b/arch/powerpc/mm/mem.c

 @@ -213,15 +213,30 @@
         */
  #ifdef CONFIG_HIGHMEM
 @@ -213,15 +213,30 @@
         */
  #ifdef CONFIG_HIGHMEM


@@ -42655,9 +42468,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/mem.c powerpc.git/a
                }
                totalram_pages += totalhigh_pages;
                printk(KERN_DEBUG "High memory: %luk\n",
                }
                totalram_pages += totalhigh_pages;
                printk(KERN_DEBUG "High memory: %luk\n",

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/slb.c powerpc.git/arch/powerpc/mm/slb.c
---- linux-2.6.24/arch/powerpc/mm/slb.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/slb.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/mm/slb.c
++++ b/arch/powerpc/mm/slb.c

 @@ -256,6 +256,7 @@
        static int slb_encoding_inited;
        extern unsigned int *slb_miss_kernel_load_linear;
 @@ -256,6 +256,7 @@
        static int slb_encoding_inited;
        extern unsigned int *slb_miss_kernel_load_linear;


@@ -42675,9 +42487,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/slb.c powerpc.git/a
  
                DBG("SLB: linear  LLP = %04x\n", linear_llp);
                DBG("SLB: io      LLP = %04x\n", io_llp);
  
                DBG("SLB: linear  LLP = %04x\n", linear_llp);
                DBG("SLB: io      LLP = %04x\n", io_llp);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/slb_low.S powerpc.git/arch/powerpc/mm/slb_low.S
---- linux-2.6.24/arch/powerpc/mm/slb_low.S     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/mm/slb_low.S      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/mm/slb_low.S
++++ b/arch/powerpc/mm/slb_low.S

 @@ -227,8 +227,9 @@
  
  7:    ld      r10,PACASTABRR(r13)
 @@ -227,8 +227,9 @@
  
  7:    ld      r10,PACASTABRR(r13)


@@ -42690,9 +42501,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/mm/slb_low.S powerpc.g
  
        blt+    4f
        li      r10,SLB_NUM_BOLTED
  
        blt+    4f
        li      r10,SLB_NUM_BOLTED

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/oprofile/op_model_cell.c powerpc.git/arch/powerpc/oprofile/op_model_cell.c
---- linux-2.6.24/arch/powerpc/oprofile/op_model_cell.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/oprofile/op_model_cell.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/oprofile/op_model_cell.c
++++ b/arch/powerpc/oprofile/op_model_cell.c

 @@ -61,7 +61,7 @@
  #define NUM_THREADS 2         /* number of physical threads in
                               * physical processor
 @@ -61,7 +61,7 @@
  #define NUM_THREADS 2         /* number of physical threads in
                               * physical processor


@@ -42762,9 +42572,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/oprofile/op_model_cell
        for (i = 0; i < NUM_INPUT_BUS_WORDS; i++)
                input_bus[i] = 0xff;
  
        for (i = 0; i < NUM_INPUT_BUS_WORDS; i++)
                input_bus[i] = 0xff;
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/Kconfig powerpc.git/arch/powerpc/platforms/40x/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/40x/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/Kconfig     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/40x/Kconfig
++++ b/arch/powerpc/platforms/40x/Kconfig

 @@ -14,28 +14,34 @@
  #     help
  #       This option enables support for the CPCI405 board.
 @@ -14,28 +14,34 @@
  #     help
  #       This option enables support for the CPCI405 board.


@@ -42834,18 +42643,16 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/Kconfig
  config 405GPR
        bool
  
  config 405GPR
        bool
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/Makefile powerpc.git/arch/powerpc/platforms/40x/Makefile
---- linux-2.6.24/arch/powerpc/platforms/40x/Makefile   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/Makefile    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/40x/Makefile
++++ b/arch/powerpc/platforms/40x/Makefile

 @@ -1,3 +1,5 @@
  obj-$(CONFIG_KILAUEA)                         += kilauea.o
 +obj-$(CONFIG_MAKALU)                          += makalu.o
  obj-$(CONFIG_WALNUT)                          += walnut.o
  obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)     += virtex.o
 +obj-$(CONFIG_EP405)                           += ep405.o
 @@ -1,3 +1,5 @@
  obj-$(CONFIG_KILAUEA)                         += kilauea.o
 +obj-$(CONFIG_MAKALU)                          += makalu.o
  obj-$(CONFIG_WALNUT)                          += walnut.o
  obj-$(CONFIG_XILINX_VIRTEX_GENERIC_BOARD)     += virtex.o
 +obj-$(CONFIG_EP405)                           += ep405.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/ep405.c powerpc.git/arch/powerpc/platforms/40x/ep405.c
---- linux-2.6.24/arch/powerpc/platforms/40x/ep405.c    1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/ep405.c     2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/40x/ep405.c

 @@ -0,0 +1,123 @@
 +/*
 + * Architecture- / platform-specific boot-time initialization code for
 @@ -0,0 +1,123 @@
 +/*
 + * Architecture- / platform-specific boot-time initialization code for


@@ -42970,9 +42777,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/ep405.c
 +      .get_irq                = uic_get_irq,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};
 +      .get_irq                = uic_get_irq,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/kilauea.c powerpc.git/arch/powerpc/platforms/40x/kilauea.c
---- linux-2.6.24/arch/powerpc/platforms/40x/kilauea.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/kilauea.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/40x/kilauea.c
++++ b/arch/powerpc/platforms/40x/kilauea.c

 @@ -19,8 +19,9 @@
  #include <asm/udbg.h>
  #include <asm/time.h>
 @@ -19,8 +19,9 @@
  #include <asm/udbg.h>
  #include <asm/time.h>


@@ -43009,9 +42815,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/kilauea.
        return 1;
  }
  
        return 1;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/makalu.c powerpc.git/arch/powerpc/platforms/40x/makalu.c
---- linux-2.6.24/arch/powerpc/platforms/40x/makalu.c   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/makalu.c    2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/40x/makalu.c

 @@ -0,0 +1,58 @@
 +/*
 + * Makalu board specific routines
 @@ -0,0 +1,58 @@
 +/*
 + * Makalu board specific routines


@@ -43071,9 +42876,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/makalu.c
 +      .get_irq                        = uic_get_irq,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};
 +      .get_irq                        = uic_get_irq,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/virtex.c powerpc.git/arch/powerpc/platforms/40x/virtex.c
---- linux-2.6.24/arch/powerpc/platforms/40x/virtex.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/virtex.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/40x/virtex.c
++++ b/arch/powerpc/platforms/40x/virtex.c

 @@ -15,16 +15,23 @@
  #include <asm/time.h>
  #include <asm/xilinx_intc.h>
 @@ -15,16 +15,23 @@
  #include <asm/time.h>
  #include <asm/xilinx_intc.h>


@@ -43103,9 +42907,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/virtex.c
  
  static int __init virtex_probe(void)
  {
  
  static int __init virtex_probe(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/walnut.c powerpc.git/arch/powerpc/platforms/40x/walnut.c
---- linux-2.6.24/arch/powerpc/platforms/40x/walnut.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/40x/walnut.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/40x/walnut.c
++++ b/arch/powerpc/platforms/40x/walnut.c

 @@ -24,8 +24,9 @@
  #include <asm/udbg.h>
  #include <asm/time.h>
 @@ -24,8 +24,9 @@
  #include <asm/udbg.h>
  #include <asm/time.h>


@@ -43144,9 +42947,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/40x/walnut.c
        return 1;
  }
  
        return 1;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Kconfig powerpc.git/arch/powerpc/platforms/44x/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/44x/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/Kconfig     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/44x/Kconfig
++++ b/arch/powerpc/platforms/44x/Kconfig

 @@ -3,6 +3,7 @@
        depends on 44x
        default n
 @@ -3,6 +3,7 @@
        depends on 44x
        default n


@@ -43254,9 +43056,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Kconfig
  
  # 44x errata/workaround config symbols, selected by the CPU models above
  config IBM440EP_ERR42
  
  # 44x errata/workaround config symbols, selected by the CPU models above
  config IBM440EP_ERR42

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Makefile powerpc.git/arch/powerpc/platforms/44x/Makefile
---- linux-2.6.24/arch/powerpc/platforms/44x/Makefile   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/Makefile    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/44x/Makefile
++++ b/arch/powerpc/platforms/44x/Makefile

 @@ -1,4 +1,9 @@
  obj-$(CONFIG_44x)     := misc_44x.o
  obj-$(CONFIG_EBONY)   += ebony.o
 @@ -1,4 +1,9 @@
  obj-$(CONFIG_44x)     := misc_44x.o
  obj-$(CONFIG_EBONY)   += ebony.o


@@ -43268,9 +43069,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/Makefile
 +obj-$(CONFIG_RAINIER) += rainier.o
 +obj-$(CONFIG_WARP)    += warp.o
 +obj-$(CONFIG_WARP)    += warp-nand.o
 +obj-$(CONFIG_RAINIER) += rainier.o
 +obj-$(CONFIG_WARP)    += warp.o
 +obj-$(CONFIG_WARP)    += warp-nand.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/bamboo.c powerpc.git/arch/powerpc/platforms/44x/bamboo.c
---- linux-2.6.24/arch/powerpc/platforms/44x/bamboo.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/bamboo.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/44x/bamboo.c
++++ b/arch/powerpc/platforms/44x/bamboo.c

 @@ -21,9 +21,11 @@
  #include <asm/udbg.h>
  #include <asm/time.h>
 @@ -21,9 +21,11 @@
  #include <asm/udbg.h>
  #include <asm/time.h>


@@ -43309,9 +43109,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/bamboo.c
        return 1;
  }
  
        return 1;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/ebony.c powerpc.git/arch/powerpc/platforms/44x/ebony.c
---- linux-2.6.24/arch/powerpc/platforms/44x/ebony.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/ebony.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/44x/ebony.c
++++ b/arch/powerpc/platforms/44x/ebony.c

 @@ -18,16 +18,18 @@
  
  #include <linux/init.h>
 @@ -18,16 +18,18 @@
  
  #include <linux/init.h>


@@ -43358,9 +43157,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/ebony.c
        return 1;
  }
  
        return 1;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/katmai.c powerpc.git/arch/powerpc/platforms/44x/katmai.c
---- linux-2.6.24/arch/powerpc/platforms/44x/katmai.c   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/katmai.c    2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/44x/katmai.c

 @@ -0,0 +1,63 @@
 +/*
 + * Katmai board specific routines
 @@ -0,0 +1,63 @@
 +/*
 + * Katmai board specific routines


@@ -43425,9 +43223,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/katmai.c
 +      .restart                        = ppc44x_reset_system,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};
 +      .restart                        = ppc44x_reset_system,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/rainier.c powerpc.git/arch/powerpc/platforms/44x/rainier.c
---- linux-2.6.24/arch/powerpc/platforms/44x/rainier.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/rainier.c   2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/44x/rainier.c

 @@ -0,0 +1,62 @@
 +/*
 + * Rainier board specific routines
 @@ -0,0 +1,62 @@
 +/*
 + * Rainier board specific routines


@@ -43491,9 +43288,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/rainier.
 +      .restart                        = ppc44x_reset_system,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};
 +      .restart                        = ppc44x_reset_system,
 +      .calibrate_decr                 = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/sequoia.c powerpc.git/arch/powerpc/platforms/44x/sequoia.c
---- linux-2.6.24/arch/powerpc/platforms/44x/sequoia.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/sequoia.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/44x/sequoia.c
++++ b/arch/powerpc/platforms/44x/sequoia.c

 @@ -21,9 +21,11 @@
  #include <asm/udbg.h>
  #include <asm/time.h>
 @@ -21,9 +21,11 @@
  #include <asm/udbg.h>
  #include <asm/time.h>


@@ -43532,9 +43328,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/sequoia.
        return 1;
  }
  
        return 1;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/taishan.c powerpc.git/arch/powerpc/platforms/44x/taishan.c
---- linux-2.6.24/arch/powerpc/platforms/44x/taishan.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/taishan.c   2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/44x/taishan.c

 @@ -0,0 +1,73 @@
 +/*
 + * Taishan board specific routines based off ebony.c code
 @@ -0,0 +1,73 @@
 +/*
 + * Taishan board specific routines based off ebony.c code


@@ -43609,9 +43404,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/taishan.
 +      .restart                = ppc44x_reset_system,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};
 +      .restart                = ppc44x_reset_system,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/warp-nand.c powerpc.git/arch/powerpc/platforms/44x/warp-nand.c
---- linux-2.6.24/arch/powerpc/platforms/44x/warp-nand.c        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/warp-nand.c 2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/44x/warp-nand.c

 @@ -0,0 +1,105 @@
 +/*
 + * PIKA Warp(tm) NAND flash specific routines
 @@ -0,0 +1,105 @@
 +/*
 + * PIKA Warp(tm) NAND flash specific routines


@@ -43718,9 +43512,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/warp-nan
 +device_initcall(warp_setup_nand_flash);
 +
 +#endif
 +device_initcall(warp_setup_nand_flash);
 +
 +#endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/warp.c powerpc.git/arch/powerpc/platforms/44x/warp.c
---- linux-2.6.24/arch/powerpc/platforms/44x/warp.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/44x/warp.c      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/44x/warp.c

 @@ -0,0 +1,153 @@
 +/*
 + * PIKA Warp(tm) board specific routines
 @@ -0,0 +1,153 @@
 +/*
 + * PIKA Warp(tm) board specific routines


@@ -43875,9 +43668,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/44x/warp.c p
 +}
 +device_initcall(pika_dtm_start);
 +#endif
 +}
 +device_initcall(pika_dtm_start);
 +#endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/Kconfig powerpc.git/arch/powerpc/platforms/52xx/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/52xx/Kconfig   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/Kconfig    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/52xx/Kconfig
++++ b/arch/powerpc/platforms/52xx/Kconfig

 @@ -19,6 +19,28 @@
  
          It is safe to say 'Y' here
 @@ -19,6 +19,28 @@
  
          It is safe to say 'Y' here


@@ -43918,9 +43710,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/Kconfig
        default n
 -
 -
        default n
 -
 -

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/Makefile powerpc.git/arch/powerpc/platforms/52xx/Makefile
---- linux-2.6.24/arch/powerpc/platforms/52xx/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/Makefile   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/52xx/Makefile
++++ b/arch/powerpc/platforms/52xx/Makefile

 @@ -6,6 +6,7 @@
  obj-$(CONFIG_PCI)             += mpc52xx_pci.o
  endif
 @@ -6,6 +6,7 @@
  obj-$(CONFIG_PCI)             += mpc52xx_pci.o
  endif


@@ -43929,9 +43720,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/Makefil
  obj-$(CONFIG_PPC_EFIKA)               += efika.o
  obj-$(CONFIG_PPC_LITE5200)    += lite5200.o
  
  obj-$(CONFIG_PPC_EFIKA)               += efika.o
  obj-$(CONFIG_PPC_LITE5200)    += lite5200.o
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite5200.c powerpc.git/arch/powerpc/platforms/52xx/lite5200.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/lite5200.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/lite5200.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/52xx/lite5200.c
++++ b/arch/powerpc/platforms/52xx/lite5200.c

 @@ -42,10 +42,13 @@
  static void __init
  lite5200_fix_clock_config(void)
 @@ -42,10 +42,13 @@
  static void __init
  lite5200_fix_clock_config(void)


@@ -43988,9 +43778,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite520
  }
  
  /*
  }
  
  /*

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite5200_pm.c powerpc.git/arch/powerpc/platforms/52xx/lite5200_pm.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/lite5200_pm.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/lite5200_pm.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/52xx/lite5200_pm.c
++++ b/arch/powerpc/platforms/52xx/lite5200_pm.c

 @@ -42,6 +42,8 @@
  
  static int lite5200_pm_prepare(void)
 @@ -42,6 +42,8 @@
  
  static int lite5200_pm_prepare(void)


@@ -44011,9 +43800,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/lite520
        if (!mbar) {
                printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__);
                return -ENOSYS;
        if (!mbar) {
                printk(KERN_ERR "%s:%i Error mapping registers\n", __func__, __LINE__);
                return -ENOSYS;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc5200_simple.c powerpc.git/arch/powerpc/platforms/52xx/mpc5200_simple.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/mpc5200_simple.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/mpc5200_simple.c   2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/52xx/mpc5200_simple.c

 @@ -0,0 +1,85 @@
 +/*
 + * Support for 'mpc5200-simple-platform' compatible boards.
 @@ -0,0 +1,85 @@
 +/*
 + * Support for 'mpc5200-simple-platform' compatible boards.


@@ -44100,9 +43888,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc5200
 +      .restart        = mpc52xx_restart,
 +      .calibrate_decr = generic_calibrate_decr,
 +};
 +      .restart        = mpc52xx_restart,
 +      .calibrate_decr = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_common.c powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_common.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_common.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_common.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
++++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c

 @@ -26,45 +26,6 @@
   */
  static volatile struct mpc52xx_gpt *mpc52xx_wdt = NULL;
 @@ -26,45 +26,6 @@
   */
  static volatile struct mpc52xx_gpt *mpc52xx_wdt = NULL;


@@ -44208,9 +43995,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
        }
  }
  
        }
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pci.c powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pci.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pci.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pci.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
++++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c

 @@ -363,7 +363,7 @@
  
        pr_debug("Adding MPC52xx PCI host bridge %s\n", node->full_name);
 @@ -363,7 +363,7 @@
  
        pr_debug("Adding MPC52xx PCI host bridge %s\n", node->full_name);


@@ -44238,9 +44024,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
 +      mpc52xx_add_bridge(pci);
 +      of_node_put(pci);
 +}
 +      mpc52xx_add_bridge(pci);
 +      of_node_put(pci);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pic.c powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pic.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pic.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pic.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
++++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c

 @@ -364,16 +364,18 @@
  {
        u32 intr_ctrl;
 @@ -364,16 +364,18 @@
  {
        u32 intr_ctrl;


@@ -44263,9 +44048,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
        if (!sdma)
                panic(__FILE__  ": find_and_map failed on 'mpc5200-bestcomm'. "
                                "Check node !");
        if (!sdma)
                panic(__FILE__  ": find_and_map failed on 'mpc5200-bestcomm'. "
                                "Check node !");

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pm.c
---- linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx_pm.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/52xx/mpc52xx_pm.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
++++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c

 @@ -59,10 +59,14 @@
  
  int mpc52xx_pm_prepare(void)
 @@ -59,10 +59,14 @@
  
  int mpc52xx_pm_prepare(void)


@@ -44283,9 +44067,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/52xx/mpc52xx
                return -ENOSYS;
        }
        /* these offsets are from mpc5200 users manual */
                return -ENOSYS;
        }
        /* these offsets are from mpc5200 users manual */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/Kconfig powerpc.git/arch/powerpc/platforms/82xx/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/82xx/Kconfig   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/82xx/Kconfig    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/82xx/Kconfig
++++ b/arch/powerpc/platforms/82xx/Kconfig

 @@ -26,6 +26,19 @@
        help
          This option enables support for the PQ2FADS board
 @@ -26,6 +26,19 @@
        help
          This option enables support for the PQ2FADS board


@@ -44306,17 +44089,15 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/Kconfig
  endchoice
  
  config PQ2ADS
  endchoice
  
  config PQ2ADS

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/Makefile powerpc.git/arch/powerpc/platforms/82xx/Makefile
---- linux-2.6.24/arch/powerpc/platforms/82xx/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/82xx/Makefile   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/82xx/Makefile
++++ b/arch/powerpc/platforms/82xx/Makefile

 @@ -5,3 +5,4 @@
  obj-$(CONFIG_CPM2) += pq2.o
  obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o
  obj-$(CONFIG_PQ2FADS) += pq2fads.o
 +obj-$(CONFIG_EP8248E) += ep8248e.o
 @@ -5,3 +5,4 @@
  obj-$(CONFIG_CPM2) += pq2.o
  obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o
  obj-$(CONFIG_PQ2FADS) += pq2fads.o
 +obj-$(CONFIG_EP8248E) += ep8248e.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/ep8248e.c powerpc.git/arch/powerpc/platforms/82xx/ep8248e.c
---- linux-2.6.24/arch/powerpc/platforms/82xx/ep8248e.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/82xx/ep8248e.c  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/82xx/ep8248e.c

 @@ -0,0 +1,324 @@
 +/*
 + * Embedded Planet EP8248E support
 @@ -0,0 +1,324 @@
 +/*
 + * Embedded Planet EP8248E support


@@ -44642,9 +44423,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/ep8248e
 +      .restart = pq2_restart,
 +      .progress = udbg_progress,
 +};
 +      .restart = pq2_restart,
 +      .progress = udbg_progress,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/pq2.c powerpc.git/arch/powerpc/platforms/82xx/pq2.c
---- linux-2.6.24/arch/powerpc/platforms/82xx/pq2.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/82xx/pq2.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/82xx/pq2.c
++++ b/arch/powerpc/platforms/82xx/pq2.c

 @@ -53,13 +53,13 @@
        if (of_address_to_resource(np, 0, &r) || r.end - r.start < 0x10b)
                goto err;
 @@ -53,13 +53,13 @@
        if (of_address_to_resource(np, 0, &r) || r.end - r.start < 0x10b)
                goto err;


@@ -44661,9 +44441,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/pq2.c p
  
        setup_indirect_pci(hose, r.start + 0x100, r.start + 0x104, 0);
        pci_process_bridge_OF_ranges(hose, np, 1);
  
        setup_indirect_pci(hose, r.start + 0x100, r.start + 0x104, 0);
        pci_process_bridge_OF_ranges(hose, np, 1);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/pq2fads.c powerpc.git/arch/powerpc/platforms/82xx/pq2fads.c
---- linux-2.6.24/arch/powerpc/platforms/82xx/pq2fads.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/82xx/pq2fads.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/82xx/pq2fads.c
++++ b/arch/powerpc/platforms/82xx/pq2fads.c

 @@ -15,12 +15,12 @@
  #include <linux/init.h>
  #include <linux/interrupt.h>
 @@ -15,12 +15,12 @@
  #include <linux/init.h>
  #include <linux/interrupt.h>


@@ -44678,9 +44457,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/82xx/pq2fads
  #include <asm/time.h>
  
  #include <sysdev/fsl_soc.h>
  #include <asm/time.h>
  
  #include <sysdev/fsl_soc.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/Kconfig powerpc.git/arch/powerpc/platforms/83xx/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/83xx/Kconfig   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/Kconfig    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/Kconfig
++++ b/arch/powerpc/platforms/83xx/Kconfig

 @@ -50,6 +50,11 @@
        help
          This option enables support for the MPC836x MDS Processor Board.
 @@ -50,6 +50,11 @@
        help
          This option enables support for the MPC836x MDS Processor Board.


@@ -44703,17 +44481,15 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/Kconfig
 +      select PPC_UDBG_16550
 +      select PPC_INDIRECT_PCI
 +      default y if MPC837x_MDS
 +      select PPC_UDBG_16550
 +      select PPC_INDIRECT_PCI
 +      default y if MPC837x_MDS

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/Makefile powerpc.git/arch/powerpc/platforms/83xx/Makefile
---- linux-2.6.24/arch/powerpc/platforms/83xx/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/Makefile   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/Makefile
++++ b/arch/powerpc/platforms/83xx/Makefile

 @@ -9,3 +9,4 @@
  obj-$(CONFIG_MPC834x_ITX)     += mpc834x_itx.o
  obj-$(CONFIG_MPC836x_MDS)     += mpc836x_mds.o
  obj-$(CONFIG_MPC832x_MDS)     += mpc832x_mds.o
 +obj-$(CONFIG_MPC837x_MDS)     += mpc837x_mds.o
 @@ -9,3 +9,4 @@
  obj-$(CONFIG_MPC834x_ITX)     += mpc834x_itx.o
  obj-$(CONFIG_MPC836x_MDS)     += mpc836x_mds.o
  obj-$(CONFIG_MPC832x_MDS)     += mpc832x_mds.o
 +obj-$(CONFIG_MPC837x_MDS)     += mpc837x_mds.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc8313_rdb.c powerpc.git/arch/powerpc/platforms/83xx/mpc8313_rdb.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc8313_rdb.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc8313_rdb.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/mpc8313_rdb.c
++++ b/arch/powerpc/platforms/83xx/mpc8313_rdb.c

 @@ -14,6 +14,7 @@
   */
  
 @@ -14,6 +14,7 @@
   */
  


@@ -44748,9 +44524,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc8313
  define_machine(mpc8313_rdb) {
        .name                   = "MPC8313 RDB",
        .probe                  = mpc8313_rdb_probe,
  define_machine(mpc8313_rdb) {
        .name                   = "MPC8313 RDB",
        .probe                  = mpc8313_rdb_probe,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x_mds.c powerpc.git/arch/powerpc/platforms/83xx/mpc832x_mds.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x_mds.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc832x_mds.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
++++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c

 @@ -23,9 +23,9 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>
 @@ -23,9 +23,9 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>


@@ -44780,9 +44555,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x
  
  static void __init mpc832x_sys_init_IRQ(void)
  {
  
  static void __init mpc832x_sys_init_IRQ(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x_rdb.c powerpc.git/arch/powerpc/platforms/83xx/mpc832x_rdb.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x_rdb.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc832x_rdb.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
++++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c

 @@ -19,8 +19,8 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/mmc_spi.h>
 @@ -19,8 +19,8 @@
  #include <linux/spi/spi.h>
  #include <linux/spi/mmc_spi.h>


@@ -44829,9 +44603,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc832x
  
  void __init mpc832x_rdb_init_IRQ(void)
  {
  
  void __init mpc832x_rdb_init_IRQ(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x_itx.c powerpc.git/arch/powerpc/platforms/83xx/mpc834x_itx.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x_itx.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc834x_itx.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
++++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c

 @@ -23,6 +23,7 @@
  #include <linux/delay.h>
  #include <linux/seq_file.h>
 @@ -23,6 +23,7 @@
  #include <linux/delay.h>
  #include <linux/seq_file.h>


@@ -44858,9 +44631,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x
  /* ************************************************************************
   *
   * Setup the architecture
  /* ************************************************************************
   *
   * Setup the architecture

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x_mds.c powerpc.git/arch/powerpc/platforms/83xx/mpc834x_mds.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x_mds.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc834x_mds.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
++++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c

 @@ -23,6 +23,7 @@
  #include <linux/delay.h>
  #include <linux/seq_file.h>
 @@ -23,6 +23,7 @@
  #include <linux/delay.h>
  #include <linux/seq_file.h>


@@ -44899,9 +44671,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc834x
  }
  
  define_machine(mpc834x_mds) {
  }
  
  define_machine(mpc834x_mds) {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc836x_mds.c powerpc.git/arch/powerpc/platforms/83xx/mpc836x_mds.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc836x_mds.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc836x_mds.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
++++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c

 @@ -29,9 +29,9 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>
 @@ -29,9 +29,9 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>


@@ -44931,9 +44702,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc836x
  
  static void __init mpc836x_mds_init_IRQ(void)
  {
  
  static void __init mpc836x_mds_init_IRQ(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc837x_mds.c powerpc.git/arch/powerpc/platforms/83xx/mpc837x_mds.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc837x_mds.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc837x_mds.c      2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c

 @@ -0,0 +1,147 @@
 +/*
 + * arch/powerpc/platforms/83xx/mpc837x_mds.c
 @@ -0,0 +1,147 @@
 +/*
 + * arch/powerpc/platforms/83xx/mpc837x_mds.c


@@ -45082,9 +44852,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc837x
 +      .calibrate_decr         = generic_calibrate_decr,
 +      .progress               = udbg_progress,
 +};
 +      .calibrate_decr         = generic_calibrate_decr,
 +      .progress               = udbg_progress,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc83xx.h powerpc.git/arch/powerpc/platforms/83xx/mpc83xx.h
---- linux-2.6.24/arch/powerpc/platforms/83xx/mpc83xx.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/mpc83xx.h  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/mpc83xx.h
++++ b/arch/powerpc/platforms/83xx/mpc83xx.h

 @@ -14,6 +14,7 @@
  #define MPC83XX_SCCR_USB_DRCM_11   0x00300000
  #define MPC83XX_SCCR_USB_DRCM_01   0x00100000
 @@ -14,6 +14,7 @@
  #define MPC83XX_SCCR_USB_DRCM_11   0x00300000
  #define MPC83XX_SCCR_USB_DRCM_01   0x00100000


@@ -45102,9 +44871,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/mpc83xx
  
  /* system i/o configuration register high */
  #define MPC83XX_SICRH_OFFS         0x118
  
  /* system i/o configuration register high */
  #define MPC83XX_SICRH_OFFS         0x118

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/pci.c powerpc.git/arch/powerpc/platforms/83xx/pci.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/pci.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/pci.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/pci.c
++++ b/arch/powerpc/platforms/83xx/pci.c

 @@ -54,7 +54,7 @@
                       " bus 0\n", dev->full_name);
        }
 @@ -54,7 +54,7 @@
                       " bus 0\n", dev->full_name);
        }


@@ -45114,9 +44882,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/pci.c p
        hose = pcibios_alloc_controller(dev);
        if (!hose)
                return -ENOMEM;
        hose = pcibios_alloc_controller(dev);
        if (!hose)
                return -ENOMEM;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/usb.c powerpc.git/arch/powerpc/platforms/83xx/usb.c
---- linux-2.6.24/arch/powerpc/platforms/83xx/usb.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/83xx/usb.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/83xx/usb.c
++++ b/arch/powerpc/platforms/83xx/usb.c

 @@ -41,7 +41,7 @@
        sicrl = in_be32(immap + MPC83XX_SICRL_OFFS) & ~MPC834X_SICRL_USB_MASK;
        sicrh = in_be32(immap + MPC83XX_SICRH_OFFS) & ~MPC834X_SICRH_USB_UTMI;
 @@ -41,7 +41,7 @@
        sicrl = in_be32(immap + MPC83XX_SICRL_OFFS) & ~MPC834X_SICRL_USB_MASK;
        sicrh = in_be32(immap + MPC83XX_SICRH_OFFS) & ~MPC834X_SICRH_USB_UTMI;


@@ -45188,9 +44955,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/83xx/usb.c p
 +      return ret;
 +}
 +#endif /* CONFIG_PPC_MPC837x */
 +      return ret;
 +}
 +#endif /* CONFIG_PPC_MPC837x */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_ads.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ads.c
---- linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_ads.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ads.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
++++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c

 @@ -52,9 +52,9 @@
  {
        int cascade_irq;
 @@ -52,9 +52,9 @@
  {
        int cascade_irq;


@@ -45252,9 +45018,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
  
  /*
   * Called very early, device-tree isn't unflattened
  
  /*
   * Called very early, device-tree isn't unflattened

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_cds.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_cds.c
---- linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_cds.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_cds.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
++++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c

 @@ -222,9 +222,6 @@
        struct device_node *cascade_node = NULL;
        int cascade_irq;
 @@ -222,9 +222,6 @@
        struct device_node *cascade_node = NULL;
        int cascade_irq;


@@ -45275,9 +45040,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
  
  #endif /* CONFIG_PPC_I8259 */
  
  
  #endif /* CONFIG_PPC_I8259 */
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_ds.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ds.c
---- linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_ds.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_ds.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
++++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c

 @@ -123,7 +123,7 @@
        struct device_node* node;
        struct resource rsrc;
 @@ -123,7 +123,7 @@
        struct device_node* node;
        struct resource rsrc;


@@ -45287,9 +45051,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
        of_address_to_resource(node, 0, &rsrc);
  
        if ((rsrc.start & 0xfffff) == primary_phb_addr) {
        of_address_to_resource(node, 0, &rsrc);
  
        if ((rsrc.start & 0xfffff) == primary_phb_addr) {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_mds.c powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_mds.c
---- linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx_mds.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/85xx/mpc85xx_mds.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
++++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c

 @@ -30,9 +30,9 @@
  #include <linux/initrd.h>
  #include <linux/module.h>
 @@ -30,9 +30,9 @@
  #include <linux/initrd.h>
  #include <linux/module.h>


@@ -45320,9 +45083,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/85xx/mpc85xx
  
  static void __init mpc85xx_mds_pic_init(void)
  {
  
  static void __init mpc85xx_mds_pic_init(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc8610_hpcd.c powerpc.git/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
---- linux-2.6.24/arch/powerpc/platforms/86xx/mpc8610_hpcd.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/86xx/mpc8610_hpcd.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
++++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c

 @@ -34,9 +34,24 @@
  
  #include <asm/mpic.h>
 @@ -34,9 +34,24 @@
  
  #include <asm/mpic.h>


@@ -45357,9 +45119,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc8610
        struct of_irq oirq;
        int virq, pin = 2;
        u32 laddr[3];
        struct of_irq oirq;
        int virq, pin = 2;
        u32 laddr[3];

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c powerpc.git/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
---- linux-2.6.24/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
++++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

 @@ -18,6 +18,7 @@
  #include <linux/kdev_t.h>
  #include <linux/delay.h>
 @@ -18,6 +18,7 @@
  #include <linux/kdev_t.h>
  #include <linux/delay.h>


@@ -45397,9 +45158,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/86xx/mpc86xx
  define_machine(mpc86xx_hpcn) {
        .name                   = "MPC86xx HPCN",
        .probe                  = mpc86xx_hpcn_probe,
  define_machine(mpc86xx_hpcn) {
        .name                   = "MPC86xx HPCN",
        .probe                  = mpc86xx_hpcn_probe,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/Kconfig powerpc.git/arch/powerpc/platforms/8xx/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/8xx/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/Kconfig     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/8xx/Kconfig
++++ b/arch/powerpc/platforms/8xx/Kconfig

 @@ -18,6 +18,7 @@
  config MPC86XADS
        bool "MPC86XADS"
 @@ -18,6 +18,7 @@
  config MPC86XADS
        bool "MPC86XADS"


@@ -45424,17 +45184,15 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/Kconfig
  endchoice
  
  menu "Freescale Ethernet driver platform-specific options"
  endchoice
  
  menu "Freescale Ethernet driver platform-specific options"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/Makefile powerpc.git/arch/powerpc/platforms/8xx/Makefile
---- linux-2.6.24/arch/powerpc/platforms/8xx/Makefile   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/Makefile    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/8xx/Makefile
++++ b/arch/powerpc/platforms/8xx/Makefile

 @@ -5,3 +5,4 @@
  obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
  obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
  obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o
 +obj-$(CONFIG_PPC_ADDER875) += adder875.o
 @@ -5,3 +5,4 @@
  obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
  obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
  obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o
 +obj-$(CONFIG_PPC_ADDER875) += adder875.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/adder875.c powerpc.git/arch/powerpc/platforms/8xx/adder875.c
---- linux-2.6.24/arch/powerpc/platforms/8xx/adder875.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/adder875.c  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/8xx/adder875.c

 @@ -0,0 +1,118 @@
 +/* Analogue & Micro Adder MPC875 board support
 + *
 @@ -0,0 +1,118 @@
 +/* Analogue & Micro Adder MPC875 board support
 + *


@@ -45554,9 +45312,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/adder875
 +      .get_rtc_time = mpc8xx_get_rtc_time,
 +      .progress = udbg_progress,
 +};
 +      .get_rtc_time = mpc8xx_get_rtc_time,
 +      .progress = udbg_progress,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/ep88xc.c powerpc.git/arch/powerpc/platforms/8xx/ep88xc.c
---- linux-2.6.24/arch/powerpc/platforms/8xx/ep88xc.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/ep88xc.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/8xx/ep88xc.c
++++ b/arch/powerpc/platforms/8xx/ep88xc.c

 @@ -155,12 +155,11 @@
  static int __init declare_of_platform_devices(void)
  {
 @@ -155,12 +155,11 @@
  static int __init declare_of_platform_devices(void)
  {


@@ -45572,9 +45329,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/ep88xc.c
  
  define_machine(ep88xc) {
        .name = "Embedded Planet EP88xC",
  
  define_machine(ep88xc) {
        .name = "Embedded Planet EP88xC",

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/m8xx_setup.c powerpc.git/arch/powerpc/platforms/8xx/m8xx_setup.c
---- linux-2.6.24/arch/powerpc/platforms/8xx/m8xx_setup.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/m8xx_setup.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
++++ b/arch/powerpc/platforms/8xx/m8xx_setup.c

 @@ -120,7 +120,7 @@
        ppc_tb_freq /= 16;
        ppc_proc_freq = 50000000;
 @@ -120,7 +120,7 @@
        ppc_tb_freq /= 16;
        ppc_proc_freq = 50000000;


@@ -45584,9 +45340,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/m8xx_set
                                "(not found)\n");
  
        printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
                                "(not found)\n");
  
        printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xads.h powerpc.git/arch/powerpc/platforms/8xx/mpc86xads.h
---- linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xads.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/mpc86xads.h 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/8xx/mpc86xads.h
++++ b/arch/powerpc/platforms/8xx/mpc86xads.h

 @@ -15,27 +15,6 @@
  #ifndef __ASM_MPC86XADS_H__
  #define __ASM_MPC86XADS_H__
 @@ -15,27 +15,6 @@
  #ifndef __ASM_MPC86XADS_H__
  #define __ASM_MPC86XADS_H__


@@ -45644,9 +45399,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xad
 -
  #endif /* __ASM_MPC86XADS_H__ */
  #endif /* __KERNEL__ */
 -
  #endif /* __ASM_MPC86XADS_H__ */
  #endif /* __KERNEL__ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xads_setup.c powerpc.git/arch/powerpc/platforms/8xx/mpc86xads_setup.c
---- linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xads_setup.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/mpc86xads_setup.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
++++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c

 @@ -6,264 +6,133 @@
   *
   * Copyright 2005 MontaVista Software Inc.
 @@ -6,264 +6,133 @@
   *
   * Copyright 2005 MontaVista Software Inc.


@@ -45996,9 +45750,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc86xad
        .get_rtc_time           = mpc8xx_get_rtc_time,
 +      .progress               = udbg_progress,
  };
        .get_rtc_time           = mpc8xx_get_rtc_time,
 +      .progress               = udbg_progress,
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc885ads_setup.c powerpc.git/arch/powerpc/platforms/8xx/mpc885ads_setup.c
---- linux-2.6.24/arch/powerpc/platforms/8xx/mpc885ads_setup.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/8xx/mpc885ads_setup.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
++++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c

 @@ -264,12 +264,11 @@
  static int __init declare_of_platform_devices(void)
  {
 @@ -264,12 +264,11 @@
  static int __init declare_of_platform_devices(void)
  {


@@ -46014,9 +45767,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/8xx/mpc885ad
  
  define_machine(mpc885_ads) {
        .name                   = "Freescale MPC885 ADS",
  
  define_machine(mpc885_ads) {
        .name                   = "Freescale MPC885 ADS",

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig powerpc.git/arch/powerpc/platforms/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/Kconfig        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/Kconfig 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/Kconfig
++++ b/arch/powerpc/platforms/Kconfig

 @@ -22,6 +22,7 @@
        depends on 6xx
        select FSL_SOC
 @@ -22,6 +22,7 @@
        depends on 6xx
        select FSL_SOC


@@ -46057,9 +45809,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig powe
  source "arch/powerpc/sysdev/bestcomm/Kconfig"
  
  endmenu
  source "arch/powerpc/sysdev/bestcomm/Kconfig"
  
  endmenu

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig.cputype powerpc.git/arch/powerpc/platforms/Kconfig.cputype
---- linux-2.6.24/arch/powerpc/platforms/Kconfig.cputype        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/Kconfig.cputype 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/Kconfig.cputype
++++ b/arch/powerpc/platforms/Kconfig.cputype

 @@ -43,6 +43,7 @@
        bool "AMCC 40x"
        select PPC_DCR_NATIVE
 @@ -43,6 +43,7 @@
        bool "AMCC 40x"
        select PPC_DCR_NATIVE


@@ -46068,9 +45819,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/Kconfig.cput
  
  config 44x
        bool "AMCC 44x"
  
  config 44x
        bool "AMCC 44x"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/Makefile powerpc.git/arch/powerpc/platforms/cell/Makefile
---- linux-2.6.24/arch/powerpc/platforms/cell/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/Makefile   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/Makefile
++++ b/arch/powerpc/platforms/cell/Makefile

 @@ -20,7 +20,7 @@
  
  obj-$(CONFIG_SPU_BASE)                        += spu_callbacks.o spu_base.o \
 @@ -20,7 +20,7 @@
  
  obj-$(CONFIG_SPU_BASE)                        += spu_callbacks.o spu_base.o \


@@ -46080,9 +45830,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/Makefil
                                           $(spu-priv1-y) \
                                           $(spu-manage-y) \
                                           spufs/
                                           $(spu-priv1-y) \
                                           $(spu-manage-y) \
                                           spufs/

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpufreq.c powerpc.git/arch/powerpc/platforms/cell/cbe_cpufreq.c
---- linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpufreq.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/cbe_cpufreq.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/cbe_cpufreq.c
++++ b/arch/powerpc/platforms/cell/cbe_cpufreq.c

 @@ -21,8 +21,9 @@
   */
  
 @@ -21,8 +21,9 @@
   */
  


@@ -46094,9 +45843,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpu
  #include <asm/prom.h>
  #include <asm/cell-regs.h>
  #include "cbe_cpufreq.h"
  #include <asm/prom.h>
  #include <asm/cell-regs.h>
  #include "cbe_cpufreq.h"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c powerpc.git/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
---- linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c
++++ b/arch/powerpc/platforms/cell/cbe_cpufreq_pmi.c

 @@ -23,7 +23,8 @@
  #include <linux/kernel.h>
  #include <linux/types.h>
 @@ -23,7 +23,8 @@
  #include <linux/kernel.h>
  #include <linux/types.h>


@@ -46107,9 +45855,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_cpu
  #include <asm/processor.h>
  #include <asm/prom.h>
  #include <asm/pmi.h>
  #include <asm/processor.h>
  #include <asm/prom.h>
  #include <asm/pmi.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_regs.c powerpc.git/arch/powerpc/platforms/cell/cbe_regs.c
---- linux-2.6.24/arch/powerpc/platforms/cell/cbe_regs.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/cbe_regs.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/cbe_regs.c
++++ b/arch/powerpc/platforms/cell/cbe_regs.c

 @@ -9,13 +9,13 @@
  #include <linux/percpu.h>
  #include <linux/types.h>
 @@ -9,13 +9,13 @@
  #include <linux/percpu.h>
  #include <linux/types.h>


@@ -46134,9 +45881,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/cbe_reg
                        return;
                }
                map->cpu_node = cpu;
                        return;
                }
                map->cpu_node = cpu;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/io-workarounds.c powerpc.git/arch/powerpc/platforms/cell/io-workarounds.c
---- linux-2.6.24/arch/powerpc/platforms/cell/io-workarounds.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/io-workarounds.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/io-workarounds.c
++++ b/arch/powerpc/platforms/cell/io-workarounds.c

 @@ -238,7 +238,7 @@
  static void __init spider_pci_add_one(struct pci_controller *phb)
  {
 @@ -238,7 +238,7 @@
  static void __init spider_pci_add_one(struct pci_controller *phb)
  {


@@ -46169,9 +45915,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/io-work
  }
 -arch_initcall(spider_pci_workaround_init);
 +machine_arch_initcall(cell, spider_pci_workaround_init);
  }
 -arch_initcall(spider_pci_workaround_init);
 +machine_arch_initcall(cell, spider_pci_workaround_init);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c powerpc.git/arch/powerpc/platforms/cell/iommu.c
---- linux-2.6.24/arch/powerpc/platforms/cell/iommu.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/iommu.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/iommu.c
++++ b/arch/powerpc/platforms/cell/iommu.c

 @@ -26,14 +26,15 @@
  #include <linux/init.h>
  #include <linux/interrupt.h>
 @@ -26,14 +26,15 @@
  #include <linux/init.h>
  #include <linux/interrupt.h>


@@ -46274,9 +46019,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/iommu.c
 +machine_arch_initcall(cell, cell_iommu_init);
 +machine_arch_initcall(celleb_native, cell_iommu_init);
  
 +machine_arch_initcall(cell, cell_iommu_init);
 +machine_arch_initcall(celleb_native, cell_iommu_init);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/pmu.c powerpc.git/arch/powerpc/platforms/cell/pmu.c
---- linux-2.6.24/arch/powerpc/platforms/cell/pmu.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/pmu.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/pmu.c
++++ b/arch/powerpc/platforms/cell/pmu.c

 @@ -213,7 +213,7 @@
                break;
  
 @@ -213,7 +213,7 @@
                break;
  


@@ -46305,9 +46049,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/pmu.c p
  
  void cbe_sync_irq(int node)
  {
  
  void cbe_sync_irq(int node)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/setup.c powerpc.git/arch/powerpc/platforms/cell/setup.c
---- linux-2.6.24/arch/powerpc/platforms/cell/setup.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/setup.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/setup.c
++++ b/arch/powerpc/platforms/cell/setup.c

 @@ -30,6 +30,7 @@
  #include <linux/console.h>
  #include <linux/mutex.h>
 @@ -30,6 +30,7 @@
  #include <linux/console.h>
  #include <linux/mutex.h>


@@ -46343,9 +46086,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/setup.c
  
  static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
  {
  
  static void cell_mpic_cascade(unsigned int irq, struct irq_desc *desc)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/smp.c powerpc.git/arch/powerpc/platforms/cell/smp.c
---- linux-2.6.24/arch/powerpc/platforms/cell/smp.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/smp.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/smp.c
++++ b/arch/powerpc/platforms/cell/smp.c

 @@ -42,6 +42,7 @@
  #include <asm/firmware.h>
  #include <asm/system.h>
 @@ -42,6 +42,7 @@
  #include <asm/firmware.h>
  #include <asm/system.h>


@@ -46363,9 +46105,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/smp.c p
                return 0;
  
        return 1;
                return 0;
  
        return 1;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_base.c powerpc.git/arch/powerpc/platforms/cell/spu_base.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spu_base.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_base.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spu_base.c
++++ b/arch/powerpc/platforms/cell/spu_base.c

 @@ -34,6 +34,7 @@
  #include <linux/linux_logo.h>
  #include <asm/spu.h>
 @@ -34,6 +34,7 @@
  #include <linux/linux_logo.h>
  #include <asm/spu.h>


@@ -46752,9 +46493,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_bas
  }
  EXPORT_SYMBOL_GPL(spu_add_sysdev_attr_group);
  
  }
  EXPORT_SYMBOL_GPL(spu_add_sysdev_attr_group);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_fault.c powerpc.git/arch/powerpc/platforms/cell/spu_fault.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spu_fault.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_fault.c        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/cell/spu_fault.c

 @@ -0,0 +1,98 @@
 +/*
 + * SPU mm fault handler
 @@ -0,0 +1,98 @@
 +/*
 + * SPU mm fault handler


@@ -46854,9 +46594,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_fau
 +      return -EFAULT;
 +}
 +EXPORT_SYMBOL_GPL(spu_handle_mm_fault);
 +      return -EFAULT;
 +}
 +EXPORT_SYMBOL_GPL(spu_handle_mm_fault);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_manage.c powerpc.git/arch/powerpc/platforms/cell/spu_manage.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spu_manage.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spu_manage.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spu_manage.c
++++ b/arch/powerpc/platforms/cell/spu_manage.c

 @@ -35,6 +35,7 @@
  #include <asm/firmware.h>
  #include <asm/prom.h>
 @@ -35,6 +35,7 @@
  #include <asm/firmware.h>
  #include <asm/prom.h>


@@ -46927,9 +46666,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spu_man
 +      .disable_spu = disable_spu_by_master_run,
        .init_affinity = init_affinity,
  };
 +      .disable_spu = disable_spu_by_master_run,
        .init_affinity = init_affinity,
  };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/Makefile powerpc.git/arch/powerpc/platforms/cell/spufs/Makefile
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/Makefile    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/Makefile     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/Makefile
++++ b/arch/powerpc/platforms/cell/spufs/Makefile

 @@ -1,8 +1,8 @@
 -obj-y += switch.o fault.o lscsa_alloc.o
  
 @@ -1,8 +1,8 @@
 -obj-y += switch.o fault.o lscsa_alloc.o
  


@@ -46940,9 +46678,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/M
  
  # Rules to build switch.o with the help of SPU tool chain
  SPU_CROSS     := spu-
  
  # Rules to build switch.o with the help of SPU tool chain
  SPU_CROSS     := spu-

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/backing_ops.c powerpc.git/arch/powerpc/platforms/cell/spufs/backing_ops.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/backing_ops.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/backing_ops.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/backing_ops.c
++++ b/arch/powerpc/platforms/cell/spufs/backing_ops.c

 @@ -106,16 +106,20 @@
                if (stat & 0xff0000)
                        ret |= POLLIN | POLLRDNORM;
 @@ -106,16 +106,20 @@
                if (stat & 0xff0000)
                        ret |= POLLIN | POLLRDNORM;


@@ -47031,9 +46768,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/b
        .master_start = spu_backing_master_start,
        .master_stop = spu_backing_master_stop,
        .set_mfc_query = spu_backing_set_mfc_query,
        .master_start = spu_backing_master_start,
        .master_stop = spu_backing_master_stop,
        .set_mfc_query = spu_backing_set_mfc_query,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/context.c powerpc.git/arch/powerpc/platforms/cell/spufs/context.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/context.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/context.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/context.c
++++ b/arch/powerpc/platforms/cell/spufs/context.c

 @@ -52,6 +52,7 @@
        init_waitqueue_head(&ctx->wbox_wq);
        init_waitqueue_head(&ctx->stop_wq);
 @@ -52,6 +52,7 @@
        init_waitqueue_head(&ctx->wbox_wq);
        init_waitqueue_head(&ctx->stop_wq);


@@ -47117,9 +46853,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/c
  }
  
  /**
  }
  
  /**

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/coredump.c powerpc.git/arch/powerpc/platforms/cell/spufs/coredump.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/coredump.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/coredump.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/coredump.c
++++ b/arch/powerpc/platforms/cell/spufs/coredump.c

 @@ -148,7 +148,9 @@
  
        fd = 0;
 @@ -148,7 +148,9 @@
  
        fd = 0;


@@ -47142,9 +46877,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/c
  
                for (j = 0; spufs_coredump_read[j].name != NULL; j++) {
                        rc = spufs_arch_write_note(ctx, j, file, fd, foffset);
  
                for (j = 0; spufs_coredump_read[j].name != NULL; j++) {
                        rc = spufs_arch_write_note(ctx, j, file, fd, foffset);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/fault.c powerpc.git/arch/powerpc/platforms/cell/spufs/fault.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/fault.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/fault.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/fault.c
++++ b/arch/powerpc/platforms/cell/spufs/fault.c

 @@ -28,117 +28,71 @@
  
  #include "spufs.h"
 @@ -28,117 +28,71 @@
  
  #include "spufs.h"


@@ -47381,9 +47115,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        return ret;
  }
 -EXPORT_SYMBOL_GPL(spufs_handle_class1);
        return ret;
  }
 -EXPORT_SYMBOL_GPL(spufs_handle_class1);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/file.c powerpc.git/arch/powerpc/platforms/cell/spufs/file.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/file.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/file.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/file.c
++++ b/arch/powerpc/platforms/cell/spufs/file.c

 @@ -40,6 +40,120 @@
  
  #define SPUFS_MMAP_4K (PAGE_SIZE == 0x1000)
 @@ -40,6 +40,120 @@
  
  #define SPUFS_MMAP_4K (PAGE_SIZE == 0x1000)


@@ -48263,9 +47996,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/f
        seq_printf(s, "%s %llu %llu %llu %llu "
                      "%llu %llu %llu %llu %llu %llu %llu %llu\n",
                ctx_state_names[ctx->stats.util_state],
        seq_printf(s, "%s %llu %llu %llu %llu "
                      "%llu %llu %llu %llu %llu %llu %llu %llu\n",
                ctx_state_names[ctx->stats.util_state],

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/hw_ops.c powerpc.git/arch/powerpc/platforms/cell/spufs/hw_ops.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/hw_ops.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/hw_ops.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/hw_ops.c
++++ b/arch/powerpc/platforms/cell/spufs/hw_ops.c

 @@ -76,16 +76,18 @@
                if (stat & 0xff0000)
                        ret |= POLLIN | POLLRDNORM;
 @@ -76,16 +76,18 @@
                if (stat & 0xff0000)
                        ret |= POLLIN | POLLRDNORM;


@@ -48353,9 +48085,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/h
        .master_start = spu_hw_master_start,
        .master_stop = spu_hw_master_stop,
        .set_mfc_query = spu_hw_set_mfc_query,
        .master_start = spu_hw_master_start,
        .master_stop = spu_hw_master_stop,
        .set_mfc_query = spu_hw_set_mfc_query,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c powerpc.git/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c
++++ b/arch/powerpc/platforms/cell/spufs/lscsa_alloc.c

 @@ -28,6 +28,8 @@
  #include <asm/spu_csa.h>
  #include <asm/mmu.h>
 @@ -28,6 +28,8 @@
  #include <asm/spu_csa.h>
  #include <asm/mmu.h>


@@ -48374,9 +48105,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/l
                goto fail;
  
        csa->use_big_pages = 1;
                goto fail;
  
        csa->use_big_pages = 1;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/run.c powerpc.git/arch/powerpc/platforms/cell/spufs/run.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/run.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/run.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/run.c
++++ b/arch/powerpc/platforms/cell/spufs/run.c

 @@ -15,24 +15,55 @@
  {
        struct spu_context *ctx = spu->ctx;
 @@ -15,24 +15,55 @@
  {
        struct spu_context *ctx = spu->ctx;


@@ -48677,9 +48407,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/r
        mutex_unlock(&ctx->run_mutex);
        return ret;
  }
        mutex_unlock(&ctx->run_mutex);
        return ret;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/sched.c powerpc.git/arch/powerpc/platforms/cell/spufs/sched.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/sched.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/sched.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/sched.c
++++ b/arch/powerpc/platforms/cell/spufs/sched.c

 @@ -58,6 +58,7 @@
  static struct spu_prio_array *spu_prio;
  static struct task_struct *spusched_task;
 @@ -58,6 +58,7 @@
  static struct spu_prio_array *spu_prio;
  static struct task_struct *spusched_task;


@@ -49253,9 +48982,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        kthread_stop(spusched_task);
  
        for (node = 0; node < MAX_NUMNODES; node++) {
        kthread_stop(spusched_task);
  
        for (node = 0; node < MAX_NUMNODES; node++) {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/spufs.h powerpc.git/arch/powerpc/platforms/cell/spufs/spufs.h
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/spufs.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/spufs.h      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/spufs.h
++++ b/arch/powerpc/platforms/cell/spufs/spufs.h

 @@ -71,6 +71,7 @@
        wait_queue_head_t wbox_wq;
        wait_queue_head_t stop_wq;
 @@ -71,6 +71,7 @@
        wait_queue_head_t wbox_wq;
        wait_queue_head_t stop_wq;


@@ -49372,9 +49100,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
 +              enum spu_utilization_state new_state);
  
  #endif
 +              enum spu_utilization_state new_state);
  
  #endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/switch.c powerpc.git/arch/powerpc/platforms/cell/spufs/switch.c
---- linux-2.6.24/arch/powerpc/platforms/cell/spufs/switch.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/cell/spufs/switch.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/cell/spufs/switch.c
++++ b/arch/powerpc/platforms/cell/spufs/switch.c

 @@ -48,6 +48,8 @@
  #include <asm/spu_csa.h>
  #include <asm/mmu_context.h>
 @@ -48,6 +48,8 @@
  #include <asm/spu_csa.h>
  #include <asm/mmu_context.h>


@@ -49535,9 +49262,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/cell/spufs/s
        spu_free_lscsa(csa);
  }
 -EXPORT_SYMBOL_GPL(spu_fini_csa);
        spu_free_lscsa(csa);
  }
 -EXPORT_SYMBOL_GPL(spu_fini_csa);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/Kconfig powerpc.git/arch/powerpc/platforms/celleb/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/celleb/Kconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/Kconfig  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/celleb/Kconfig
++++ b/arch/powerpc/platforms/celleb/Kconfig

 @@ -2,6 +2,8 @@
        bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
        depends on PPC_MULTIPLATFORM && PPC64
 @@ -2,6 +2,8 @@
        bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
        depends on PPC_MULTIPLATFORM && PPC64


@@ -49547,9 +49273,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/Kconf
        select PPC_INDIRECT_IO
        select PPC_OF_PLATFORM_PCI
        select HAS_TXX9_SERIAL
        select PPC_INDIRECT_IO
        select PPC_OF_PLATFORM_PCI
        select HAS_TXX9_SERIAL

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/io-workarounds.c powerpc.git/arch/powerpc/platforms/celleb/io-workarounds.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/io-workarounds.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/io-workarounds.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/celleb/io-workarounds.c
++++ b/arch/powerpc/platforms/celleb/io-workarounds.c

 @@ -22,6 +22,7 @@
  
  #undef DEBUG
 @@ -22,6 +22,7 @@
  
  #undef DEBUG


@@ -49583,9 +49308,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/io-wo
                match = of_match_node(celleb_pci_workaround_match, node);
  
                if (match) {
                match = of_match_node(celleb_pci_workaround_match, node);
  
                if (match) {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/iommu.c powerpc.git/arch/powerpc/platforms/celleb/iommu.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/iommu.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/iommu.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/celleb/iommu.c
++++ b/arch/powerpc/platforms/celleb/iommu.c

 @@ -22,8 +22,9 @@
  #include <linux/init.h>
  #include <linux/dma-mapping.h>
 @@ -22,8 +22,9 @@
  #include <linux/init.h>
  #include <linux/dma-mapping.h>


@@ -49652,9 +49376,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/iommu
  
 -arch_initcall(celleb_init_iommu);
 +machine_arch_initcall(celleb_beat, celleb_init_iommu);
  
 -arch_initcall(celleb_init_iommu);
 +machine_arch_initcall(celleb_beat, celleb_init_iommu);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/pci.c powerpc.git/arch/powerpc/platforms/celleb/pci.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/pci.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/pci.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/celleb/pci.c
++++ b/arch/powerpc/platforms/celleb/pci.c

 @@ -31,6 +31,7 @@
  #include <linux/init.h>
  #include <linux/bootmem.h>
 @@ -31,6 +31,7 @@
  #include <linux/init.h>
  #include <linux/bootmem.h>


@@ -49711,9 +49434,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/pci.c
        const struct of_device_id *match;
        int (*setup_func)(struct device_node *, struct pci_controller *);
  
        const struct of_device_id *match;
        int (*setup_func)(struct device_node *, struct pci_controller *);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/scc_epci.c powerpc.git/arch/powerpc/platforms/celleb/scc_epci.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/scc_epci.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/scc_epci.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/celleb/scc_epci.c
++++ b/arch/powerpc/platforms/celleb/scc_epci.c

 @@ -95,7 +95,7 @@
        private->dummy_page_da = dma_map_single(hose->parent,
                celleb_dummy_page_va, PAGE_SIZE, DMA_FROM_DEVICE);
 @@ -95,7 +95,7 @@
        private->dummy_page_da = dma_map_single(hose->parent,
                celleb_dummy_page_va, PAGE_SIZE, DMA_FROM_DEVICE);


@@ -49723,9 +49445,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/scc_e
                       "Map dummy page failed.\n");
                return;
        }
                       "Map dummy page failed.\n");
                return;
        }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/scc_uhc.c powerpc.git/arch/powerpc/platforms/celleb/scc_uhc.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/scc_uhc.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/scc_uhc.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/celleb/scc_uhc.c
++++ b/arch/powerpc/platforms/celleb/scc_uhc.c

 @@ -47,7 +47,8 @@
        u32 val = 0;
        int i;
 @@ -47,7 +47,8 @@
        u32 val = 0;
        int i;


@@ -49736,9 +49457,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/scc_u
                return;
  
        uhc_base = ioremap(pci_resource_start(dev, 0),
                return;
  
        uhc_base = ioremap(pci_resource_start(dev, 0),

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/setup.c powerpc.git/arch/powerpc/platforms/celleb/setup.c
---- linux-2.6.24/arch/powerpc/platforms/celleb/setup.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/celleb/setup.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/celleb/setup.c
++++ b/arch/powerpc/platforms/celleb/setup.c

 @@ -40,6 +40,7 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>
 @@ -40,6 +40,7 @@
  #include <linux/seq_file.h>
  #include <linux/root_dev.h>


@@ -49943,9 +49663,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/celleb/setup
 +      .machine_crash_shutdown = default_machine_crash_shutdown,
 +#endif
 +};
 +      .machine_crash_shutdown = default_machine_crash_shutdown,
 +#endif
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/pci.c powerpc.git/arch/powerpc/platforms/chrp/pci.c
---- linux-2.6.24/arch/powerpc/platforms/chrp/pci.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/chrp/pci.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/chrp/pci.c
++++ b/arch/powerpc/platforms/chrp/pci.c

 @@ -198,7 +198,7 @@
                printk ("RTAS supporting Pegasos OF not found, please upgrade"
                        " your firmware\n");
 @@ -198,7 +198,7 @@
                printk ("RTAS supporting Pegasos OF not found, please upgrade"
                        " your firmware\n");


@@ -49955,24 +49674,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/pci.c p
        /* keep the reference to the root node */
  }
  
        /* keep the reference to the root node */
  }
  

-@@ -354,7 +354,7 @@
-  * mode as well. The same fixup must be done to the class-code property in
-  * the IDE node /pci@80000000/ide@C,1
-  */
--static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
-+static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
- {
-       u8 progif;
-       struct pci_dev *viaisa;
-@@ -375,4 +375,4 @@
- 
-       pci_dev_put(viaisa);
- }
--DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
-+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/setup.c powerpc.git/arch/powerpc/platforms/chrp/setup.c
---- linux-2.6.24/arch/powerpc/platforms/chrp/setup.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/chrp/setup.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/chrp/setup.c
++++ b/arch/powerpc/platforms/chrp/setup.c

 @@ -115,7 +115,7 @@
        seq_printf(m, "machine\t\t: CHRP %s\n", model);
  
 @@ -115,7 +115,7 @@
        seq_printf(m, "machine\t\t: CHRP %s\n", model);
  


@@ -50072,9 +49775,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/chrp/setup.c
        .show_cpuinfo           = chrp_show_cpuinfo,
        .init_IRQ               = chrp_init_IRQ,
        .restart                = rtas_restart,
        .show_cpuinfo           = chrp_show_cpuinfo,
        .init_IRQ               = chrp_init_IRQ,
        .restart                = rtas_restart,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/Kconfig powerpc.git/arch/powerpc/platforms/embedded6xx/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/embedded6xx/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/Kconfig     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/embedded6xx/Kconfig
++++ b/arch/powerpc/platforms/embedded6xx/Kconfig

 @@ -9,6 +9,8 @@
        select FSL_SOC
        select PPC_UDBG_16550 if SERIAL_8250
 @@ -9,6 +9,8 @@
        select FSL_SOC
        select PPC_UDBG_16550 if SERIAL_8250


@@ -50147,9 +49849,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
  
  config MPC10X_STORE_GATHERING
        bool "Enable MPC10x store gathering"
  
  config MPC10X_STORE_GATHERING
        bool "Enable MPC10x store gathering"

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/Makefile powerpc.git/arch/powerpc/platforms/embedded6xx/Makefile
---- linux-2.6.24/arch/powerpc/platforms/embedded6xx/Makefile   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/Makefile    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/embedded6xx/Makefile
++++ b/arch/powerpc/platforms/embedded6xx/Makefile

 @@ -3,5 +3,6 @@
  #
  obj-$(CONFIG_MPC7448HPC2)     += mpc7448_hpc2.o
 @@ -3,5 +3,6 @@
  #
  obj-$(CONFIG_MPC7448HPC2)     += mpc7448_hpc2.o


@@ -50157,9 +49858,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
 +obj-$(CONFIG_STORCENTER)      += storcenter.o
  obj-$(CONFIG_PPC_HOLLY)               += holly.o
  obj-$(CONFIG_PPC_PRPMC2800)   += prpmc2800.o
 +obj-$(CONFIG_STORCENTER)      += storcenter.o
  obj-$(CONFIG_PPC_HOLLY)               += holly.o
  obj-$(CONFIG_PPC_PRPMC2800)   += prpmc2800.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/holly.c powerpc.git/arch/powerpc/platforms/embedded6xx/holly.c
---- linux-2.6.24/arch/powerpc/platforms/embedded6xx/holly.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/holly.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/embedded6xx/holly.c
++++ b/arch/powerpc/platforms/embedded6xx/holly.c

 @@ -20,12 +20,12 @@
  #include <linux/console.h>
  #include <linux/delay.h>
 @@ -20,12 +20,12 @@
  #include <linux/console.h>
  #include <linux/delay.h>


@@ -50182,9 +49882,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
  
  #undef DEBUG
  
  
  #undef DEBUG
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c powerpc.git/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
---- linux-2.6.24/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
++++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c

 @@ -53,8 +53,6 @@
  
  #define MPC7448HPC2_PCI_CFG_PHYS 0xfb000000
 @@ -53,8 +53,6 @@
  
  #define MPC7448HPC2_PCI_CFG_PHYS 0xfb000000


@@ -50194,9 +49893,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
  int mpc7448_hpc2_exclude_device(struct pci_controller *hose,
                                u_char bus, u_char devfn)
  {
  int mpc7448_hpc2_exclude_device(struct pci_controller *hose,
                                u_char bus, u_char devfn)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/storcenter.c powerpc.git/arch/powerpc/platforms/embedded6xx/storcenter.c
---- linux-2.6.24/arch/powerpc/platforms/embedded6xx/storcenter.c       1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/embedded6xx/storcenter.c        2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/platforms/embedded6xx/storcenter.c

 @@ -0,0 +1,192 @@
 +/*
 + * Board setup routines for the storcenter
 @@ -0,0 +1,192 @@
 +/*
 + * Board setup routines for the storcenter


@@ -50390,9 +50088,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/embedded6xx/
 +      .restart                = storcenter_restart,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};
 +      .restart                = storcenter_restart,
 +      .calibrate_decr         = generic_calibrate_decr,
 +};

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/Makefile powerpc.git/arch/powerpc/platforms/iseries/Makefile
---- linux-2.6.24/arch/powerpc/platforms/iseries/Makefile       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/Makefile        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/iseries/Makefile
++++ b/arch/powerpc/platforms/iseries/Makefile

 @@ -5,7 +5,7 @@
  obj-y += exception.o
  obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o dt_mod.o mf.o lpevents.o \
 @@ -5,7 +5,7 @@
  obj-y += exception.o
  obj-y += hvlog.o hvlpconfig.o lpardata.o setup.o dt_mod.o mf.o lpevents.o \


@@ -50402,9 +50099,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/Make
  obj-$(CONFIG_SMP) += smp.o
  obj-$(CONFIG_VIOPATH) += viopath.o vio.o
  obj-$(CONFIG_MODULES) += ksyms.o
  obj-$(CONFIG_SMP) += smp.o
  obj-$(CONFIG_VIOPATH) += viopath.o vio.o
  obj-$(CONFIG_MODULES) += ksyms.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/iommu.c powerpc.git/arch/powerpc/platforms/iseries/iommu.c
---- linux-2.6.24/arch/powerpc/platforms/iseries/iommu.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/iommu.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/iseries/iommu.c
++++ b/arch/powerpc/platforms/iseries/iommu.c

 @@ -163,8 +163,10 @@
                    (it->it_type == TCE_PCI) &&
                    (it->it_offset == tbl->it_offset) &&
 @@ -163,8 +163,10 @@
                    (it->it_type == TCE_PCI) &&
                    (it->it_offset == tbl->it_offset) &&


@@ -50417,9 +50113,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/iomm
        }
        return NULL;
  }
        }
        return NULL;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/lpevents.c powerpc.git/arch/powerpc/platforms/iseries/lpevents.c
---- linux-2.6.24/arch/powerpc/platforms/iseries/lpevents.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/lpevents.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/iseries/lpevents.c
++++ b/arch/powerpc/platforms/iseries/lpevents.c

 @@ -239,7 +239,7 @@
                         * other CPUs, and that the deleted handler isn't
                         * still running on another CPU when we return.
 @@ -239,7 +239,7 @@
                         * other CPUs, and that the deleted handler isn't
                         * still running on another CPU when we return.


@@ -50429,9 +50124,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/lpev
                        return 0;
                }
        }
                        return 0;
                }
        }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.c powerpc.git/arch/powerpc/platforms/iseries/pci.c
---- linux-2.6.24/arch/powerpc/platforms/iseries/pci.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/pci.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/iseries/pci.c
++++ b/arch/powerpc/platforms/iseries/pci.c

 @@ -1,5 +1,6 @@
  /*
   * Copyright (C) 2001 Allan Trautman, IBM Corporation
 @@ -1,5 +1,6 @@
  /*
   * Copyright (C) 2001 Allan Trautman, IBM Corporation


@@ -51420,9 +51114,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
        }
  
        of_node_put(root);
        }
  
        of_node_put(root);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.h powerpc.git/arch/powerpc/platforms/iseries/pci.h
---- linux-2.6.24/arch/powerpc/platforms/iseries/pci.h  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/pci.h   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/iseries/pci.h
++++ b/arch/powerpc/platforms/iseries/pci.h

 @@ -30,10 +30,6 @@
   * End Change Activity
   */
 @@ -30,10 +30,6 @@
   * End Change Activity
   */


@@ -51462,9 +51155,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/pci.
 +#endif
  
  #endif /* _PLATFORMS_ISERIES_PCI_H */
 +#endif
  
  #endif /* _PLATFORMS_ISERIES_PCI_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setup.c powerpc.git/arch/powerpc/platforms/iseries/setup.c
---- linux-2.6.24/arch/powerpc/platforms/iseries/setup.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/setup.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/iseries/setup.c
++++ b/arch/powerpc/platforms/iseries/setup.c

 @@ -63,6 +63,7 @@
  #include "main_store.h"
  #include "call_sm.h"
 @@ -63,6 +63,7 @@
  #include "main_store.h"
  #include "call_sm.h"


@@ -51588,9 +51280,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setu
        /* XXX Implement enable_pmcs for iSeries */
  };
  
        /* XXX Implement enable_pmcs for iSeries */
  };
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setup.h powerpc.git/arch/powerpc/platforms/iseries/setup.h
---- linux-2.6.24/arch/powerpc/platforms/iseries/setup.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/setup.h 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/iseries/setup.h
++++ b/arch/powerpc/platforms/iseries/setup.h

 @@ -17,6 +17,7 @@
  #ifndef       __ISERIES_SETUP_H__
  #define       __ISERIES_SETUP_H__
 @@ -17,6 +17,7 @@
  #ifndef       __ISERIES_SETUP_H__
  #define       __ISERIES_SETUP_H__


@@ -51599,9 +51290,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/setu
  extern unsigned long iSeries_get_boot_time(void);
  extern int iSeries_set_rtc_time(struct rtc_time *tm);
  extern void iSeries_get_rtc_time(struct rtc_time *tm);
  extern unsigned long iSeries_get_boot_time(void);
  extern int iSeries_set_rtc_time(struct rtc_time *tm);
  extern void iSeries_get_rtc_time(struct rtc_time *tm);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/vpdinfo.c powerpc.git/arch/powerpc/platforms/iseries/vpdinfo.c
---- linux-2.6.24/arch/powerpc/platforms/iseries/vpdinfo.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/iseries/vpdinfo.c       1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/platforms/iseries/vpdinfo.c
++++ /dev/null

 @@ -1,275 +0,0 @@
 -/*
 - * This code gets the card location of the hardware
 @@ -1,275 +0,0 @@
 -/*
 - * This code gets the card location of the hardware


@@ -51878,9 +51568,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/iseries/vpdi
 -                      card, (int)(PciDev->class >> 8));
 -      }
 -}
 -                      card, (int)(PciDev->class >> 8));
 -      }
 -}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/Kconfig powerpc.git/arch/powerpc/platforms/maple/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/maple/Kconfig  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/maple/Kconfig   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/maple/Kconfig
++++ b/arch/powerpc/platforms/maple/Kconfig

 @@ -1,6 +1,7 @@
  config PPC_MAPLE
        depends on PPC_MULTIPLATFORM && PPC64
 @@ -1,6 +1,7 @@
  config PPC_MAPLE
        depends on PPC_MULTIPLATFORM && PPC64


@@ -51889,9 +51578,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/Kconfi
        select MPIC
        select U3_DART
        select MPIC_U3_HT_IRQS
        select MPIC
        select U3_DART
        select MPIC_U3_HT_IRQS

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/pci.c powerpc.git/arch/powerpc/platforms/maple/pci.c
---- linux-2.6.24/arch/powerpc/platforms/maple/pci.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/maple/pci.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/maple/pci.c
++++ b/arch/powerpc/platforms/maple/pci.c

 @@ -558,7 +558,7 @@
         * safe assumptions hopefully.
         */
 @@ -558,7 +558,7 @@
         * safe assumptions hopefully.
         */


@@ -51901,9 +51589,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/pci.c
                PCI_DN(np)->busno = 0xf0;
                for (np = np->child; np; np = np->sibling)
                        PCI_DN(np)->busno = 0xf0;
                PCI_DN(np)->busno = 0xf0;
                for (np = np->child; np; np = np->sibling)
                        PCI_DN(np)->busno = 0xf0;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/setup.c powerpc.git/arch/powerpc/platforms/maple/setup.c
---- linux-2.6.24/arch/powerpc/platforms/maple/setup.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/maple/setup.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/maple/setup.c
++++ b/arch/powerpc/platforms/maple/setup.c

 @@ -42,6 +42,7 @@
  #include <linux/serial.h>
  #include <linux/smp.h>
 @@ -42,6 +42,7 @@
  #include <linux/serial.h>
  #include <linux/smp.h>


@@ -51920,9 +51607,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/maple/setup.
  #include <asm/lmb.h>
  #include <asm/mpic.h>
  #include <asm/rtas.h>
  #include <asm/lmb.h>
  #include <asm/mpic.h>
  #include <asm/rtas.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/Kconfig powerpc.git/arch/powerpc/platforms/pasemi/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/pasemi/Kconfig 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/Kconfig  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pasemi/Kconfig
++++ b/arch/powerpc/platforms/pasemi/Kconfig

 @@ -3,6 +3,7 @@
        bool "PA Semi SoC-based platforms"
        default n
 @@ -3,6 +3,7 @@
        bool "PA Semi SoC-based platforms"
        default n


@@ -51954,17 +51640,15 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/Kconf
 -      interface.
 -
  endmenu
 -      interface.
 -
  endmenu

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/Makefile powerpc.git/arch/powerpc/platforms/pasemi/Makefile
---- linux-2.6.24/arch/powerpc/platforms/pasemi/Makefile        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/Makefile 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pasemi/Makefile
++++ b/arch/powerpc/platforms/pasemi/Makefile

 @@ -1,4 +1,3 @@
  obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o
  obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o
 -obj-$(CONFIG_ELECTRA_IDE) += electra_ide.o
  obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o
 @@ -1,4 +1,3 @@
  obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o
  obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o
 -obj-$(CONFIG_ELECTRA_IDE) += electra_ide.o
  obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/cpufreq.c powerpc.git/arch/powerpc/platforms/pasemi/cpufreq.c
---- linux-2.6.24/arch/powerpc/platforms/pasemi/cpufreq.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/cpufreq.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pasemi/cpufreq.c
++++ b/arch/powerpc/platforms/pasemi/cpufreq.c

 @@ -32,6 +32,7 @@
  #include <asm/io.h>
  #include <asm/prom.h>
 @@ -32,6 +32,7 @@
  #include <asm/io.h>
  #include <asm/prom.h>


@@ -52019,9 +51703,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/cpufr
                return -ENODEV;
  
        return cpufreq_register_driver(&pas_cpufreq_driver);
                return -ENODEV;
  
        return cpufreq_register_driver(&pas_cpufreq_driver);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/electra_ide.c powerpc.git/arch/powerpc/platforms/pasemi/electra_ide.c
---- linux-2.6.24/arch/powerpc/platforms/pasemi/electra_ide.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/electra_ide.c    1970-01-01 01:00:00.000000000 +0100
+--- a/arch/powerpc/platforms/pasemi/electra_ide.c
++++ /dev/null

 @@ -1,96 +0,0 @@
 -/*
 - * Copyright (C) 2007 PA Semi, Inc
 @@ -1,96 +0,0 @@
 -/*
 - * Copyright (C) 2007 PA Semi, Inc


@@ -52119,9 +51802,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/elect
 -MODULE_LICENSE("GPL");
 -MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
 -MODULE_DESCRIPTION("PA Semi Electra IDE driver");
 -MODULE_LICENSE("GPL");
 -MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
 -MODULE_DESCRIPTION("PA Semi Electra IDE driver");

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_mdio.c powerpc.git/arch/powerpc/platforms/pasemi/gpio_mdio.c
---- linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_mdio.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/gpio_mdio.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pasemi/gpio_mdio.c
++++ b/arch/powerpc/platforms/pasemi/gpio_mdio.c

 @@ -30,7 +30,7 @@
  #include <linux/interrupt.h>
  #include <linux/phy.h>
 @@ -30,7 +30,7 @@
  #include <linux/interrupt.h>
  #include <linux/phy.h>


@@ -52283,9 +51965,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/gpio_
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Olof Johansson <olof@lixom.net>");
 +MODULE_DESCRIPTION("Driver for MDIO over GPIO on PA Semi PWRficient-based boards");
 +MODULE_LICENSE("GPL");
 +MODULE_AUTHOR("Olof Johansson <olof@lixom.net>");
 +MODULE_DESCRIPTION("Driver for MDIO over GPIO on PA Semi PWRficient-based boards");

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/idle.c powerpc.git/arch/powerpc/platforms/pasemi/idle.c
---- linux-2.6.24/arch/powerpc/platforms/pasemi/idle.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/idle.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pasemi/idle.c
++++ b/arch/powerpc/platforms/pasemi/idle.c

 @@ -74,9 +74,6 @@
  
  static int __init pasemi_idle_init(void)
 @@ -74,9 +74,6 @@
  
  static int __init pasemi_idle_init(void)


@@ -52305,9 +51986,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/idle.
  
  static int __init idle_param(char *p)
  {
  
  static int __init idle_param(char *p)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/pasemi.h powerpc.git/arch/powerpc/platforms/pasemi/pasemi.h
---- linux-2.6.24/arch/powerpc/platforms/pasemi/pasemi.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/pasemi.h 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pasemi/pasemi.h
++++ b/arch/powerpc/platforms/pasemi/pasemi.h

 @@ -16,8 +16,14 @@
  
  /* Restore astate to last set */
 @@ -16,8 +16,14 @@
  
  /* Restore astate to last set */


@@ -52323,9 +52003,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/pasem
  static inline void restore_astate(int cpu)
  {
  }
  static inline void restore_astate(int cpu)
  {
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/powersave.S powerpc.git/arch/powerpc/platforms/pasemi/powersave.S
---- linux-2.6.24/arch/powerpc/platforms/pasemi/powersave.S     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/powersave.S      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pasemi/powersave.S
++++ b/arch/powerpc/platforms/pasemi/powersave.S

 @@ -62,7 +62,16 @@
        mflr    r0
        std     r0, 16(r1)
 @@ -62,7 +62,16 @@
        mflr    r0
        std     r0, 16(r1)


@@ -52352,9 +52031,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/power
        ld      r0,16(r1)
        mtlr    r0
        blr
        ld      r0,16(r1)
        mtlr    r0
        blr

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup.c powerpc.git/arch/powerpc/platforms/pasemi/setup.c
---- linux-2.6.24/arch/powerpc/platforms/pasemi/setup.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pasemi/setup.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pasemi/setup.c
++++ b/arch/powerpc/platforms/pasemi/setup.c

 @@ -27,6 +27,7 @@
  #include <linux/delay.h>
  #include <linux/console.h>
 @@ -27,6 +27,7 @@
  #include <linux/delay.h>
  #include <linux/console.h>


@@ -52536,9 +52214,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pasemi/setup
        .probe                  = pas_probe,
        .setup_arch             = pas_setup_arch,
        .init_early             = pas_init_early,
        .probe                  = pas_probe,
        .setup_arch             = pas_setup_arch,
        .init_early             = pas_init_early,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/low_i2c.c powerpc.git/arch/powerpc/platforms/powermac/low_i2c.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/low_i2c.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/low_i2c.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/powermac/low_i2c.c
++++ b/arch/powerpc/platforms/powermac/low_i2c.c

 @@ -585,8 +585,7 @@
        struct device_node *np, *child, *parent;
  
 @@ -585,8 +585,7 @@
        struct device_node *np, *child, *parent;
  


@@ -52574,9 +52251,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/low
  }
 -subsys_initcall(pmac_i2c_create_platform_devices);
 +machine_subsys_initcall(powermac, pmac_i2c_create_platform_devices);
  }
 -subsys_initcall(pmac_i2c_create_platform_devices);
 +machine_subsys_initcall(powermac, pmac_i2c_create_platform_devices);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci.c powerpc.git/arch/powerpc/platforms/powermac/pci.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/pci.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/pci.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/powermac/pci.c
++++ b/arch/powerpc/platforms/powermac/pci.c

 @@ -40,8 +40,6 @@
  static int has_uninorth;
  #ifdef CONFIG_PPC64
 @@ -40,8 +40,6 @@
  static int has_uninorth;
  #ifdef CONFIG_PPC64


@@ -53000,9 +52676,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pci
  
  /*
   * Disable second function on K2-SATA, it's broken
  
  /*
   * Disable second function on K2-SATA, it's broken

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pfunc_base.c powerpc.git/arch/powerpc/platforms/powermac/pfunc_base.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/pfunc_base.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/pfunc_base.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/powermac/pfunc_base.c
++++ b/arch/powerpc/platforms/powermac/pfunc_base.c

 @@ -363,8 +363,7 @@
  
        return 0;
 @@ -363,8 +363,7 @@
  
        return 0;


@@ -53013,9 +52688,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pfu
  
  #ifdef CONFIG_PM
  
  
  #ifdef CONFIG_PM
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pic.c powerpc.git/arch/powerpc/platforms/powermac/pic.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/pic.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/pic.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/powermac/pic.c
++++ b/arch/powerpc/platforms/powermac/pic.c

 @@ -690,6 +690,5 @@
        sysdev_driver_register(&pmacpic_sysclass, &driver_pmacpic);
        return 0;
 @@ -690,6 +690,5 @@
        sysdev_driver_register(&pmacpic_sysclass, &driver_pmacpic);
        return 0;


@@ -53024,9 +52698,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pic
 -subsys_initcall(init_pmacpic_sysfs);
 +machine_subsys_initcall(powermac, init_pmacpic_sysfs);
  
 -subsys_initcall(init_pmacpic_sysfs);
 +machine_subsys_initcall(powermac, init_pmacpic_sysfs);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pmac.h powerpc.git/arch/powerpc/platforms/powermac/pmac.h
---- linux-2.6.24/arch/powerpc/platforms/powermac/pmac.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/pmac.h 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/powermac/pmac.h
++++ b/arch/powerpc/platforms/powermac/pmac.h

 @@ -26,7 +26,7 @@
  extern void pmac_nvram_update(void);
  extern unsigned char pmac_nvram_read_byte(int addr);
 @@ -26,7 +26,7 @@
  extern void pmac_nvram_update(void);
  extern unsigned char pmac_nvram_read_byte(int addr);


@@ -53036,9 +52709,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/pma
  extern void pmac_pcibios_after_init(void);
  extern int of_show_percpuinfo(struct seq_file *m, int i);
  
  extern void pmac_pcibios_after_init(void);
  extern int of_show_percpuinfo(struct seq_file *m, int i);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/setup.c powerpc.git/arch/powerpc/platforms/powermac/setup.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/setup.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/setup.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/powermac/setup.c
++++ b/arch/powerpc/platforms/powermac/setup.c

 @@ -51,6 +51,8 @@
  #include <linux/root_dev.h>
  #include <linux/bitops.h>
 @@ -51,6 +51,8 @@
  #include <linux/root_dev.h>
  #include <linux/bitops.h>


@@ -53117,9 +52789,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/set
                return PCI_PROBE_NORMAL;
        return PCI_PROBE_DEVTREE;
  }
                return PCI_PROBE_NORMAL;
        return PCI_PROBE_DEVTREE;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/time.c powerpc.git/arch/powerpc/platforms/powermac/time.c
---- linux-2.6.24/arch/powerpc/platforms/powermac/time.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/powermac/time.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/powermac/time.c
++++ b/arch/powerpc/platforms/powermac/time.c

 @@ -84,12 +84,14 @@
        return delta;
  }
 @@ -84,12 +84,14 @@
        return delta;
  }


@@ -53135,9 +52806,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/powermac/tim
  
  static unsigned long from_rtc_time(struct rtc_time *tm)
  {
  
  static unsigned long from_rtc_time(struct rtc_time *tm)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/Kconfig powerpc.git/arch/powerpc/platforms/ps3/Kconfig
---- linux-2.6.24/arch/powerpc/platforms/ps3/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/Kconfig     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/ps3/Kconfig
++++ b/arch/powerpc/platforms/ps3/Kconfig

 @@ -61,17 +61,6 @@
          This support is mainly for Linux kernel development.  If unsure,
          say N.
 @@ -61,17 +61,6 @@
          This support is mainly for Linux kernel development.  If unsure,
          say N.


@@ -53174,9 +52844,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/Kconfig
 +        oprofile and perfmon2, then say Y or M, otherwise say N.
 +
  endmenu
 +        oprofile and perfmon2, then say Y or M, otherwise say N.
 +
  endmenu

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-init.c powerpc.git/arch/powerpc/platforms/ps3/device-init.c
---- linux-2.6.24/arch/powerpc/platforms/ps3/device-init.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/device-init.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/ps3/device-init.c
++++ b/arch/powerpc/platforms/ps3/device-init.c

 @@ -23,6 +23,7 @@
  #include <linux/kernel.h>
  #include <linux/kthread.h>
 @@ -23,6 +23,7 @@
  #include <linux/kernel.h>
  #include <linux/kthread.h>


@@ -53802,9 +53471,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/device-i
        pr_debug(" <- %s:%d\n", __func__, __LINE__);
        return 0;
  }
        pr_debug(" <- %s:%d\n", __func__, __LINE__);
        return 0;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c powerpc.git/arch/powerpc/platforms/ps3/mm.c
---- linux-2.6.24/arch/powerpc/platforms/ps3/mm.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/mm.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/ps3/mm.c
++++ b/arch/powerpc/platforms/ps3/mm.c

 @@ -36,11 +36,6 @@
  #endif
  
 @@ -36,11 +36,6 @@
  #endif
  


@@ -53885,9 +53553,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/mm.c pow
                len = r->len;
                if (r->offset >= map.rm.size)
                        virt_addr += r->offset - map.rm.size;
                len = r->len;
                if (r->offset >= map.rm.size)
                        virt_addr += r->offset - map.rm.size;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/platform.h powerpc.git/arch/powerpc/platforms/ps3/platform.h
---- linux-2.6.24/arch/powerpc/platforms/ps3/platform.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/platform.h  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/ps3/platform.h
++++ b/arch/powerpc/platforms/ps3/platform.h

 @@ -89,13 +89,11 @@
        PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,       /* 5 */
        PS3_DEV_TYPE_SB_GPIO = 6,
 @@ -89,13 +89,11 @@
        PS3_DEV_TYPE_STOR_ROM = TYPE_ROM,       /* 5 */
        PS3_DEV_TYPE_SB_GPIO = 6,


@@ -53970,9 +53637,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/platform
  /* repository 'Other OS' area */
  
  int ps3_repository_read_boot_dat_addr(u64 *lpar_addr);
  /* repository 'Other OS' area */
  
  int ps3_repository_read_boot_dat_addr(u64 *lpar_addr);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/repository.c powerpc.git/arch/powerpc/platforms/ps3/repository.c
---- linux-2.6.24/arch/powerpc/platforms/ps3/repository.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/repository.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/ps3/repository.c
++++ b/arch/powerpc/platforms/ps3/repository.c

 @@ -33,7 +33,7 @@
  };
  
 @@ -33,7 +33,7 @@
  };
  


@@ -54604,9 +54270,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/reposito
                        __func__, __LINE__, repo.bus_index, repo.bus_type,
                        repo.bus_id, num_dev);
  
                        __func__, __LINE__, repo.bus_index, repo.bus_type,
                        repo.bus_id, num_dev);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/spu.c powerpc.git/arch/powerpc/platforms/ps3/spu.c
---- linux-2.6.24/arch/powerpc/platforms/ps3/spu.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/spu.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/ps3/spu.c
++++ b/arch/powerpc/platforms/ps3/spu.c

 @@ -28,6 +28,7 @@
  #include <asm/spu_priv1.h>
  #include <asm/lv1call.h>
 @@ -28,6 +28,7 @@
  #include <asm/spu_priv1.h>
  #include <asm/lv1call.h>


@@ -54659,9 +54324,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/spu.c po
        BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed));
  
        spu_pdata(spu)->cache.sr1 = sr1;
        BUG_ON((sr1 & allowed) != (spu_pdata(spu)->cache.sr1 & allowed));
  
        spu_pdata(spu)->cache.sr1 = sr1;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/system-bus.c powerpc.git/arch/powerpc/platforms/ps3/system-bus.c
---- linux-2.6.24/arch/powerpc/platforms/ps3/system-bus.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/ps3/system-bus.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/ps3/system-bus.c
++++ b/arch/powerpc/platforms/ps3/system-bus.c

 @@ -42,8 +42,8 @@
        int gpu;
  } static usage_hack;
 @@ -42,8 +42,8 @@
        int gpu;
  } static usage_hack;


@@ -54723,9 +54387,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/ps3/system-b
        default:
                BUG();
        };
        default:
                BUG();
        };

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.c powerpc.git/arch/powerpc/platforms/pseries/eeh.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/eeh.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/eeh.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pseries/eeh.c
++++ b/arch/powerpc/platforms/pseries/eeh.c

 @@ -29,6 +29,8 @@
  #include <linux/rbtree.h>
  #include <linux/seq_file.h>
 @@ -29,6 +29,8 @@
  #include <linux/rbtree.h>
  #include <linux/seq_file.h>


@@ -54869,9 +54532,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh.
                eeh_add_device_tree_early(sib);
        eeh_add_device_early(dn);
  }
                eeh_add_device_tree_early(sib);
        eeh_add_device_early(dn);
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh_driver.c powerpc.git/arch/powerpc/platforms/pseries/eeh_driver.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/eeh_driver.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/eeh_driver.c    2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pseries/eeh_driver.c
++++ b/arch/powerpc/platforms/pseries/eeh_driver.c

 @@ -310,8 +310,6 @@
        const char *location, *pci_str, *drv_str;
  
 @@ -310,8 +310,6 @@
        const char *location, *pci_str, *drv_str;
  


@@ -54919,9 +54581,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/eeh_
        /* Since rtas may enable MMIO when posting the error log,
         * don't post the error log until after all dev drivers
         * have been informed.
        /* Since rtas may enable MMIO when posting the error log,
         * don't post the error log until after all dev drivers
         * have been informed.

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/iommu.c powerpc.git/arch/powerpc/platforms/pseries/iommu.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/iommu.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/iommu.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pseries/iommu.c
++++ b/arch/powerpc/platforms/pseries/iommu.c

 @@ -251,7 +251,7 @@
        const unsigned long *basep;
        const u32 *sizep;
 @@ -251,7 +251,7 @@
        const unsigned long *basep;
        const u32 *sizep;


@@ -54992,9 +54653,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/iomm
                break;
        default:
                err = NOTIFY_DONE;
                break;
        default:
                err = NOTIFY_DONE;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/pci_dlpar.c powerpc.git/arch/powerpc/platforms/pseries/pci_dlpar.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/pci_dlpar.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/pci_dlpar.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
++++ b/arch/powerpc/platforms/pseries/pci_dlpar.c

 @@ -83,7 +83,7 @@
  
  /* Must be called before pci_bus_add_devices */
 @@ -83,7 +83,7 @@
  
  /* Must be called before pci_bus_add_devices */


@@ -55051,9 +54711,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/pci_
        pci_bus_add_devices(phb->bus);
        eeh_add_device_tree_late(phb->bus);
  
        pci_bus_add_devices(phb->bus);
        eeh_add_device_tree_late(phb->bus);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/plpar_wrappers.h powerpc.git/arch/powerpc/platforms/pseries/plpar_wrappers.h
---- linux-2.6.24/arch/powerpc/platforms/pseries/plpar_wrappers.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/plpar_wrappers.h        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
++++ b/arch/powerpc/platforms/pseries/plpar_wrappers.h

 @@ -8,11 +8,6 @@
        return plpar_hcall_norets(H_POLL_PENDING);
  }
 @@ -8,11 +8,6 @@
        return plpar_hcall_norets(H_POLL_PENDING);
  }


@@ -55066,9 +54725,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/plpa
  static inline long cede_processor(void)
  {
        return plpar_hcall_norets(H_CEDE);
  static inline long cede_processor(void)
  {
        return plpar_hcall_norets(H_CEDE);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/smp.c powerpc.git/arch/powerpc/platforms/pseries/smp.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/smp.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/smp.c   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pseries/smp.c
++++ b/arch/powerpc/platforms/pseries/smp.c

 @@ -46,6 +46,7 @@
  #include <asm/pSeries_reconfig.h>
  #include <asm/mpic.h>
 @@ -46,6 +46,7 @@
  #include <asm/pSeries_reconfig.h>
  #include <asm/mpic.h>


@@ -55086,9 +54744,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/smp.
                return 0;
  
        return 1;
                return 0;
  
        return 1;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics.c powerpc.git/arch/powerpc/platforms/pseries/xics.c
---- linux-2.6.24/arch/powerpc/platforms/pseries/xics.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/xics.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pseries/xics.c
++++ b/arch/powerpc/platforms/pseries/xics.c

 @@ -87,19 +87,25 @@
  /* Direct HW low level accessors */
  
 @@ -87,19 +87,25 @@
  /* Direct HW low level accessors */
  


@@ -55259,9 +54916,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
                        goto unlock;
  
                printk(KERN_WARNING "IRQ %u affinity broken off cpu %u\n",
                        goto unlock;
  
                printk(KERN_WARNING "IRQ %u affinity broken off cpu %u\n",

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics.h powerpc.git/arch/powerpc/platforms/pseries/xics.h
---- linux-2.6.24/arch/powerpc/platforms/pseries/xics.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/platforms/pseries/xics.h  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/platforms/pseries/xics.h
++++ b/arch/powerpc/platforms/pseries/xics.h

 @@ -21,9 +21,6 @@
  extern  void xics_request_IPIs(void);
  extern void xics_migrate_irqs_away(void);
 @@ -21,9 +21,6 @@
  extern  void xics_request_IPIs(void);
  extern void xics_migrate_irqs_away(void);


@@ -55272,9 +54928,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/platforms/pseries/xics
  struct xics_ipi_struct {
        volatile unsigned long value;
  } ____cacheline_aligned;
  struct xics_ipi_struct {
        volatile unsigned long value;
  } ____cacheline_aligned;

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/Kconfig powerpc.git/arch/powerpc/sysdev/Kconfig
---- linux-2.6.24/arch/powerpc/sysdev/Kconfig   1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/Kconfig    2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/sysdev/Kconfig

 @@ -0,0 +1,8 @@
 +# For a description of the syntax of this configuration file,
 +# see Documentation/kbuild/kconfig-language.txt.
 @@ -0,0 +1,8 @@
 +# For a description of the syntax of this configuration file,
 +# see Documentation/kbuild/kconfig-language.txt.


@@ -55284,9 +54939,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/Kconfig powerpc
 +      bool
 +      depends on PCI && 4xx
 +      default n
 +      bool
 +      depends on PCI && 4xx
 +      default n

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/Makefile powerpc.git/arch/powerpc/sysdev/Makefile
---- linux-2.6.24/arch/powerpc/sysdev/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/Makefile   2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/Makefile
++++ b/arch/powerpc/sysdev/Makefile

 @@ -2,7 +2,7 @@
  EXTRA_CFLAGS                  += -mno-minimal-toc
  endif
 @@ -2,7 +2,7 @@
  EXTRA_CFLAGS                  += -mno-minimal-toc
  endif


@@ -55319,9 +54973,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/Makefile powerp
  endif
  
  # Temporary hack until we have migrated to asm-powerpc
  endif
  
  # Temporary hack until we have migrated to asm-powerpc

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/axonram.c powerpc.git/arch/powerpc/sysdev/axonram.c
---- linux-2.6.24/arch/powerpc/sysdev/axonram.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/axonram.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/axonram.c
++++ b/arch/powerpc/sysdev/axonram.c

 @@ -42,8 +42,9 @@
  #include <linux/slab.h>
  #include <linux/string.h>
 @@ -42,8 +42,9 @@
  #include <linux/slab.h>
  #include <linux/string.h>


@@ -55334,9 +54987,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/axonram.c power
  #include <asm/page.h>
  #include <asm/prom.h>
  
  #include <asm/page.h>
  #include <asm/prom.h>
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/bestcomm/bestcomm.h powerpc.git/arch/powerpc/sysdev/bestcomm/bestcomm.h
---- linux-2.6.24/arch/powerpc/sysdev/bestcomm/bestcomm.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/bestcomm/bestcomm.h        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/bestcomm/bestcomm.h
++++ b/arch/powerpc/sysdev/bestcomm/bestcomm.h

 @@ -20,7 +20,7 @@
  
  
 @@ -20,7 +20,7 @@
  
  


@@ -55346,9 +54998,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/bestcomm/bestco
  /* ======================================================================== */
  
  /**
  /* ======================================================================== */
  
  /**

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/commproc.c powerpc.git/arch/powerpc/sysdev/commproc.c
---- linux-2.6.24/arch/powerpc/sysdev/commproc.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/commproc.c 2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/commproc.c
++++ b/arch/powerpc/sysdev/commproc.c

 @@ -240,6 +240,34 @@
  #endif
  }
 @@ -240,6 +240,34 @@
  #endif
  }


@@ -55427,9 +55078,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/commproc.c powe
        }
  }
  
        }
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/cpm2_common.c powerpc.git/arch/powerpc/sysdev/cpm2_common.c
---- linux-2.6.24/arch/powerpc/sysdev/cpm2_common.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/cpm2_common.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/cpm2_common.c
++++ b/arch/powerpc/sysdev/cpm2_common.c

 @@ -82,6 +82,31 @@
        cpmp = &cpm2_immr->im_cpm;
  }
 @@ -82,6 +82,31 @@
        cpmp = &cpm2_immr->im_cpm;
  }


@@ -55462,9 +55112,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/cpm2_common.c p
  /* Set a baud rate generator.  This needs lots of work.  There are
   * eight BRGs, which can be connected to the CPM channels or output
   * as clocks.  The BRGs are in two different block of internal
  /* Set a baud rate generator.  This needs lots of work.  There are
   * eight BRGs, which can be connected to the CPM channels or output
   * as clocks.  The BRGs are in two different block of internal

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c powerpc.git/arch/powerpc/sysdev/fsl_pci.c
---- linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/fsl_pci.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/fsl_pci.c
++++ b/arch/powerpc/sysdev/fsl_pci.c

 @@ -33,8 +33,8 @@
        struct ccsr_pci __iomem *pci;
        int i;
 @@ -33,8 +33,8 @@
        struct ccsr_pci __iomem *pci;
        int i;


@@ -55680,9 +55329,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_pci.c power
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_header);
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header);
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_header);
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header);
 +DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_rio.c powerpc.git/arch/powerpc/sysdev/fsl_rio.c
---- linux-2.6.24/arch/powerpc/sysdev/fsl_rio.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/fsl_rio.c  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/sysdev/fsl_rio.c

 @@ -0,0 +1,932 @@
 +/*
 + * MPC85xx RapidIO support
 @@ -0,0 +1,932 @@
 +/*
 + * MPC85xx RapidIO support


@@ -56616,9 +56264,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_rio.c power
 +      out_be32((void *)&dbell_atmu_regs->rowar, 0x8004200b);
 +      mpc85xx_rio_doorbell_init(port);
 +}
 +      out_be32((void *)&dbell_atmu_regs->rowar, 0x8004200b);
 +      mpc85xx_rio_doorbell_init(port);
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_rio.h powerpc.git/arch/powerpc/sysdev/fsl_rio.h
---- linux-2.6.24/arch/powerpc/sysdev/fsl_rio.h 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/fsl_rio.h  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/sysdev/fsl_rio.h

 @@ -0,0 +1,20 @@
 +/*
 + * MPC85xx RapidIO definitions
 @@ -0,0 +1,20 @@
 +/*
 + * MPC85xx RapidIO definitions


@@ -56640,9 +56287,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_rio.h power
 +extern void mpc85xx_rio_setup(int law_start, int law_size);
 +
 +#endif                                /* __PPC_SYSLIB_PPC85XX_RIO_H */
 +extern void mpc85xx_rio_setup(int law_start, int law_size);
 +
 +#endif                                /* __PPC_SYSLIB_PPC85XX_RIO_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c powerpc.git/arch/powerpc/sysdev/fsl_soc.c
---- linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/fsl_soc.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/fsl_soc.c
++++ b/arch/powerpc/sysdev/fsl_soc.c

 @@ -24,6 +24,7 @@
  #include <linux/platform_device.h>
  #include <linux/of_platform.h>
 @@ -24,6 +24,7 @@
  #include <linux/platform_device.h>
  #include <linux/of_platform.h>


@@ -56892,9 +56538,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/fsl_soc.c power
        return 0;
  }
  
        return 0;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/grackle.c powerpc.git/arch/powerpc/sysdev/grackle.c
---- linux-2.6.24/arch/powerpc/sysdev/grackle.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/grackle.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/grackle.c
++++ b/arch/powerpc/sysdev/grackle.c

 @@ -57,7 +57,7 @@
  {
        setup_indirect_pci(hose, 0xfec00000, 0xfee00000, 0);
 @@ -57,7 +57,7 @@
  {
        setup_indirect_pci(hose, 0xfec00000, 0xfee00000, 0);


@@ -56904,9 +56549,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/grackle.c power
        if (machine_is_compatible("AAPL,PowerBook1998"))
                grackle_set_loop_snoop(hose, 1);
  #if 0 /* Disabled for now, HW problems ??? */
        if (machine_is_compatible("AAPL,PowerBook1998"))
                grackle_set_loop_snoop(hose, 1);
  #if 0 /* Disabled for now, HW problems ??? */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.git/arch/powerpc/sysdev/ipic.c
---- linux-2.6.24/arch/powerpc/sysdev/ipic.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/ipic.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/ipic.c
++++ b/arch/powerpc/sysdev/ipic.c

 @@ -30,11 +30,67 @@
  #include "ipic.h"
  
 @@ -30,11 +30,67 @@
  #include "ipic.h"
  


@@ -57563,9 +57207,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.c powerpc.
  }
  
  void ipic_enable_mcp(enum ipic_mcp_irq mcp_irq)
  }
  
  void ipic_enable_mcp(enum ipic_mcp_irq mcp_irq)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.h powerpc.git/arch/powerpc/sysdev/ipic.h
---- linux-2.6.24/arch/powerpc/sysdev/ipic.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/ipic.h     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/ipic.h
++++ b/arch/powerpc/sysdev/ipic.h

 @@ -23,13 +23,12 @@
  #define IPIC_IRQ_EXT7 23
  
 @@ -23,13 +23,12 @@
  #define IPIC_IRQ_EXT7 23
  


@@ -57599,9 +57242,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ipic.h powerpc.
        u8      mask;           /* mask register offset from base */
        u8      prio;           /* priority register offset from base */
        u8      force;          /* force register offset from base */
        u8      mask;           /* mask register offset from base */
        u8      prio;           /* priority register offset from base */
        u8      force;          /* force register offset from base */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mmio_nvram.c powerpc.git/arch/powerpc/sysdev/mmio_nvram.c
---- linux-2.6.24/arch/powerpc/sysdev/mmio_nvram.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mmio_nvram.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/mmio_nvram.c
++++ b/arch/powerpc/sysdev/mmio_nvram.c

 @@ -99,7 +99,7 @@
        nvram_addr = r.start;
        mmio_nvram_len = r.end - r.start + 1;
 @@ -99,7 +99,7 @@
        nvram_addr = r.start;
        mmio_nvram_len = r.end - r.start + 1;


@@ -57611,9 +57253,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mmio_nvram.c po
                ret = -EIO;
                goto out;
        }
                ret = -EIO;
                goto out;
        }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.git/arch/powerpc/sysdev/mpic.c
---- linux-2.6.24/arch/powerpc/sysdev/mpic.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mpic.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/mpic.c
++++ b/arch/powerpc/sysdev/mpic.c

 @@ -83,6 +83,7 @@
                MPIC_CPU_WHOAMI,
                MPIC_CPU_INTACK,
 @@ -83,6 +83,7 @@
                MPIC_CPU_WHOAMI,
                MPIC_CPU_INTACK,


@@ -57791,9 +57432,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.c powerpc.
                               vipi, i);
                        break;
                }
                               vipi, i);
                        break;
                }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.h powerpc.git/arch/powerpc/sysdev/mpic.h
---- linux-2.6.24/arch/powerpc/sysdev/mpic.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mpic.h     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/mpic.h
++++ b/arch/powerpc/sysdev/mpic.h

 @@ -17,6 +17,7 @@
  extern irq_hw_number_t mpic_msi_alloc_hwirqs(struct mpic *mpic, int num);
  extern void mpic_msi_free_hwirqs(struct mpic *mpic, int offset, int num);
 @@ -17,6 +17,7 @@
  extern irq_hw_number_t mpic_msi_alloc_hwirqs(struct mpic *mpic, int num);
  extern void mpic_msi_free_hwirqs(struct mpic *mpic, int offset, int num);


@@ -57821,9 +57461,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic.h powerpc.
  extern void mpic_set_affinity(unsigned int irq, cpumask_t cpumask);
  
  #endif /* _POWERPC_SYSDEV_MPIC_H */
  extern void mpic_set_affinity(unsigned int irq, cpumask_t cpumask);
  
  #endif /* _POWERPC_SYSDEV_MPIC_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic_pasemi_msi.c powerpc.git/arch/powerpc/sysdev/mpic_pasemi_msi.c
---- linux-2.6.24/arch/powerpc/sysdev/mpic_pasemi_msi.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mpic_pasemi_msi.c  2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c

 @@ -0,0 +1,172 @@
 +/*
 + * Copyright 2007, Olof Johansson, PA Semi
 @@ -0,0 +1,172 @@
 +/*
 + * Copyright 2007, Olof Johansson, PA Semi


@@ -57997,9 +57636,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mpic_pasemi_msi
 +
 +      return 0;
 +}
 +
 +      return 0;
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_dev.c powerpc.git/arch/powerpc/sysdev/mv64x60_dev.c
---- linux-2.6.24/arch/powerpc/sysdev/mv64x60_dev.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_dev.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/mv64x60_dev.c
++++ b/arch/powerpc/sysdev/mv64x60_dev.c

 @@ -241,7 +241,7 @@
  
        /* only register the shared platform device the first time through */
 @@ -241,7 +241,7 @@
  
        /* only register the shared platform device the first time through */


@@ -58049,9 +57687,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_dev.c p
        return 0;
  
  error:
        return 0;
  
  error:

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_pci.c powerpc.git/arch/powerpc/sysdev/mv64x60_pci.c
---- linux-2.6.24/arch/powerpc/sysdev/mv64x60_pci.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_pci.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/mv64x60_pci.c
++++ b/arch/powerpc/sysdev/mv64x60_pci.c

 @@ -164,8 +164,8 @@
  
  void __init mv64x60_pci_init(void)
 @@ -164,8 +164,8 @@
  
  void __init mv64x60_pci_init(void)


@@ -58063,9 +57700,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_pci.c p
 +      for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
                mv64x60_add_bridge(np);
  }
 +      for_each_compatible_node(np, "pci", "marvell,mv64x60-pci")
                mv64x60_add_bridge(np);
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_udbg.c powerpc.git/arch/powerpc/sysdev/mv64x60_udbg.c
---- linux-2.6.24/arch/powerpc/sysdev/mv64x60_udbg.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/mv64x60_udbg.c     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/mv64x60_udbg.c
++++ b/arch/powerpc/sysdev/mv64x60_udbg.c

 @@ -85,10 +85,10 @@
        if (!stdout)
                return;
 @@ -85,10 +85,10 @@
        if (!stdout)
                return;


@@ -58079,9 +57715,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/mv64x60_udbg.c
  
        of_node_put(stdout);
        if (!np)
  
        of_node_put(stdout);
        if (!np)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/of_rtc.c powerpc.git/arch/powerpc/sysdev/of_rtc.c
---- linux-2.6.24/arch/powerpc/sysdev/of_rtc.c  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/of_rtc.c   2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/sysdev/of_rtc.c

 @@ -0,0 +1,59 @@
 +/*
 + * Instantiate mmio-mapped RTC chips based on device tree information
 @@ -0,0 +1,59 @@
 +/*
 + * Instantiate mmio-mapped RTC chips based on device tree information


@@ -58142,9 +57777,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/of_rtc.c powerp
 +              }
 +      }
 +}
 +              }
 +      }
 +}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/pmi.c powerpc.git/arch/powerpc/sysdev/pmi.c
---- linux-2.6.24/arch/powerpc/sysdev/pmi.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/pmi.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/pmi.c
++++ b/arch/powerpc/sysdev/pmi.c

 @@ -28,9 +28,9 @@
  #include <linux/completion.h>
  #include <linux/spinlock.h>
 @@ -28,9 +28,9 @@
  #include <linux/completion.h>
  #include <linux/spinlock.h>


@@ -58157,9 +57791,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/pmi.c powerpc.g
  #include <asm/io.h>
  #include <asm/pmi.h>
  #include <asm/prom.h>
  #include <asm/io.h>
  #include <asm/pmi.h>
  #include <asm/prom.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.c powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.c
---- linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.c      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.c       2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/sysdev/ppc4xx_pci.c

 @@ -0,0 +1,1528 @@
 +/*
 + * PCI / PCI-X / PCI-Express support for 4xx parts
 @@ -0,0 +1,1528 @@
 +/*
 + * PCI / PCI-X / PCI-Express support for 4xx parts


@@ -59689,9 +59322,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.c po
 +}
 +arch_initcall(ppc4xx_pci_find_bridges);
 +
 +}
 +arch_initcall(ppc4xx_pci_find_bridges);
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.h powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.h
---- linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.h      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/ppc4xx_pci.h       2008-01-28 20:25:49.000000000 +0100
+--- /dev/null
++++ b/arch/powerpc/sysdev/ppc4xx_pci.h

 @@ -0,0 +1,369 @@
 +/*
 + * PCI / PCI-X / PCI-Express support for 4xx parts
 @@ -0,0 +1,369 @@
 +/*
 + * PCI / PCI-X / PCI-Express support for 4xx parts


@@ -60062,9 +59694,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/ppc4xx_pci.h po
 +
 +
 +#endif /* __PPC4XX_PCI_H__ */
 +
 +
 +#endif /* __PPC4XX_PCI_H__ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/Kconfig powerpc.git/arch/powerpc/sysdev/qe_lib/Kconfig
---- linux-2.6.24/arch/powerpc/sysdev/qe_lib/Kconfig    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/Kconfig     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/qe_lib/Kconfig
++++ b/arch/powerpc/sysdev/qe_lib/Kconfig

 @@ -4,7 +4,7 @@
  
  config UCC_SLOW
 @@ -4,7 +4,7 @@
  
  config UCC_SLOW


@@ -60074,9 +59705,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/Kconfig
        help
          This option provides qe_lib support to UCC slow
          protocols: UART, BISYNC, QMC
        help
          This option provides qe_lib support to UCC slow
          protocols: UART, BISYNC, QMC

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/qe.c powerpc.git/arch/powerpc/sysdev/qe_lib/qe.c
---- linux-2.6.24/arch/powerpc/sysdev/qe_lib/qe.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/qe.c        2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/qe_lib/qe.c
++++ b/arch/powerpc/sysdev/qe_lib/qe.c

 @@ -25,6 +25,7 @@
  #include <linux/module.h>
  #include <linux/delay.h>
 @@ -25,6 +25,7 @@
  #include <linux/module.h>
  #include <linux/delay.h>


@@ -60405,9 +60035,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/qe.c pow
 +}
 +EXPORT_SYMBOL(qe_get_firmware_info);
 +
 +}
 +EXPORT_SYMBOL(qe_get_firmware_info);
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow.c powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_slow.c
---- linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/qe_lib/ucc_slow.c  2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
++++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c

 @@ -19,6 +19,7 @@
  #include <linux/stddef.h>
  #include <linux/interrupt.h>
 @@ -19,6 +19,7 @@
  #include <linux/stddef.h>
  #include <linux/interrupt.h>


@@ -60479,9 +60108,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/qe_lib/ucc_slow
 -
 +EXPORT_SYMBOL(ucc_slow_free);
  
 -
 +EXPORT_SYMBOL(ucc_slow_free);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/tsi108_dev.c powerpc.git/arch/powerpc/sysdev/tsi108_dev.c
---- linux-2.6.24/arch/powerpc/sysdev/tsi108_dev.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/tsi108_dev.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/tsi108_dev.c
++++ b/arch/powerpc/sysdev/tsi108_dev.c

 @@ -66,14 +66,12 @@
  static int __init tsi108_eth_of_init(void)
  {
 @@ -66,14 +66,12 @@
  static int __init tsi108_eth_of_init(void)
  {


@@ -60516,9 +60144,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/tsi108_dev.c po
        return ret;
  }
  
        return ret;
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.git/arch/powerpc/sysdev/uic.c
---- linux-2.6.24/arch/powerpc/sysdev/uic.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/uic.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/uic.c
++++ b/arch/powerpc/sysdev/uic.c

 @@ -53,21 +53,23 @@
  
        /* The remapper for this UIC */
 @@ -53,21 +53,23 @@
  
        /* The remapper for this UIC */


@@ -60750,9 +60377,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/uic.c powerpc.g
        }
  }
  
        }
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/xilinx_intc.c powerpc.git/arch/powerpc/sysdev/xilinx_intc.c
---- linux-2.6.24/arch/powerpc/sysdev/xilinx_intc.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/sysdev/xilinx_intc.c      2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/sysdev/xilinx_intc.c
++++ b/arch/powerpc/sysdev/xilinx_intc.c

 @@ -135,10 +135,16 @@
        struct device_node *np;
  
 @@ -135,10 +135,16 @@
        struct device_node *np;
  


@@ -60771,9 +60397,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/sysdev/xilinx_intc.c p
  
        /* xilinx interrupt controller needs to be top level */
        BUG_ON(!np);
  
        /* xilinx interrupt controller needs to be top level */
        BUG_ON(!np);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/setjmp.S powerpc.git/arch/powerpc/xmon/setjmp.S
---- linux-2.6.24/arch/powerpc/xmon/setjmp.S    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/xmon/setjmp.S     2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/xmon/setjmp.S
++++ b/arch/powerpc/xmon/setjmp.S

 @@ -12,67 +12,6 @@
  #include <asm/ppc_asm.h>
  #include <asm/asm-offsets.h>
 @@ -12,67 +12,6 @@
  #include <asm/ppc_asm.h>
  #include <asm/asm-offsets.h>


@@ -60842,9 +60467,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/setjmp.S powerpc.
  /*
   * Grab the register values as they are now.
   * This won't do a particularily good job because we really
  /*
   * Grab the register values as they are now.
   * This won't do a particularily good job because we really

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/xmon.c powerpc.git/arch/powerpc/xmon/xmon.c
---- linux-2.6.24/arch/powerpc/xmon/xmon.c      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/powerpc/xmon/xmon.c       2008-01-28 20:25:49.000000000 +0100
+--- a/arch/powerpc/xmon/xmon.c
++++ b/arch/powerpc/xmon/xmon.c

 @@ -40,6 +40,7 @@
  #include <asm/spu.h>
  #include <asm/spu_priv1.h>
 @@ -40,6 +40,7 @@
  #include <asm/spu.h>
  #include <asm/spu_priv1.h>


@@ -60980,9 +60604,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/powerpc/xmon/xmon.c powerpc.gi
  void xmon_init(int enable)
  {
  #ifdef CONFIG_PPC_ISERIES
  void xmon_init(int enable)
  {
  #ifdef CONFIG_PPC_ISERIES

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/Makefile powerpc.git/arch/ppc/kernel/Makefile
---- linux-2.6.24/arch/ppc/kernel/Makefile      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/Makefile       2008-01-28 20:25:50.000000000 +0100
+--- a/arch/ppc/kernel/Makefile
++++ b/arch/ppc/kernel/Makefile

 @@ -13,7 +13,6 @@
                                        ppc_htab.o
  obj-$(CONFIG_MODULES)         += ppc_ksyms.o
 @@ -13,7 +13,6 @@
                                        ppc_htab.o
  obj-$(CONFIG_MODULES)         += ppc_ksyms.o


@@ -60991,9 +60614,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/Makefile powerpc.gi
  obj-$(CONFIG_KGDB)            += ppc-stub.o
  obj-$(CONFIG_SMP)             += smp.o smp-tbsync.o
  obj-$(CONFIG_KEXEC)           += machine_kexec.o relocate_kernel.o
  obj-$(CONFIG_KGDB)            += ppc-stub.o
  obj-$(CONFIG_SMP)             += smp.o smp-tbsync.o
  obj-$(CONFIG_KEXEC)           += machine_kexec.o relocate_kernel.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/head_44x.S powerpc.git/arch/ppc/kernel/head_44x.S
---- linux-2.6.24/arch/ppc/kernel/head_44x.S    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/head_44x.S     2008-01-28 20:25:50.000000000 +0100
+--- a/arch/ppc/kernel/head_44x.S
++++ b/arch/ppc/kernel/head_44x.S

 @@ -195,7 +195,7 @@
        li      r5,0
        ori     r5,r5,(PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_I | PPC44x_TLB_G)
 @@ -195,7 +195,7 @@
        li      r5,0
        ori     r5,r5,(PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_I | PPC44x_TLB_G)


@@ -61003,20 +60625,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/head_44x.S powerpc.
  
        tlbwe   r3,r0,PPC44x_TLB_PAGEID /* Load the pageid fields */
        tlbwe   r4,r0,PPC44x_TLB_XLAT   /* Load the translation fields */
  
        tlbwe   r3,r0,PPC44x_TLB_PAGEID /* Load the pageid fields */
        tlbwe   r4,r0,PPC44x_TLB_XLAT   /* Load the translation fields */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/ppc_htab.c powerpc.git/arch/ppc/kernel/ppc_htab.c
---- linux-2.6.24/arch/ppc/kernel/ppc_htab.c    2008-01-28 20:50:10.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/ppc_htab.c     2008-01-28 20:25:50.000000000 +0100
-@@ -436,6 +436,7 @@
-  */
- static ctl_table htab_ctl_table[]={
-       {
-+              .ctl_name       = KERN_PPC_L2CR,
-               .procname       = "l2cr",
-               .mode           = 0644,
-               .proc_handler   = &proc_dol2crvec,
-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/rio.c powerpc.git/arch/ppc/kernel/rio.c
---- linux-2.6.24/arch/ppc/kernel/rio.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/rio.c  1970-01-01 01:00:00.000000000 +0100
+--- a/arch/ppc/kernel/rio.c
++++ /dev/null

 @@ -1,52 +0,0 @@
 -/*
 - * RapidIO PPC32 support
 @@ -1,52 +0,0 @@
 -/*
 - * RapidIO PPC32 support


@@ -61070,9 +60680,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/rio.c powerpc.git/a
 -}
 -
 -subsys_initcall(ppc_rio_init);
 -}
 -
 -subsys_initcall(ppc_rio_init);

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/setup.c powerpc.git/arch/ppc/kernel/setup.c
---- linux-2.6.24/arch/ppc/kernel/setup.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/setup.c        2008-01-28 20:25:50.000000000 +0100
+--- a/arch/ppc/kernel/setup.c
++++ b/arch/ppc/kernel/setup.c

 @@ -37,7 +37,6 @@
  #include <asm/nvram.h>
  #include <asm/xmon.h>
 @@ -37,7 +37,6 @@
  #include <asm/nvram.h>
  #include <asm/xmon.h>


@@ -61081,9 +60690,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/setup.c powerpc.git
  
  #define USES_PPC_SYS (defined(CONFIG_85xx) || defined(CONFIG_83xx) || \
                      defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \
  
  #define USES_PPC_SYS (defined(CONFIG_85xx) || defined(CONFIG_83xx) || \
                      defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/traps.c powerpc.git/arch/ppc/kernel/traps.c
---- linux-2.6.24/arch/ppc/kernel/traps.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/kernel/traps.c        2008-01-28 20:25:50.000000000 +0100
+--- a/arch/ppc/kernel/traps.c
++++ b/arch/ppc/kernel/traps.c

 @@ -231,39 +231,25 @@
  {
  }
 @@ -231,39 +231,25 @@
  {
  }


@@ -61237,9 +60845,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/kernel/traps.c powerpc.git
  
        /*
         * Optional platform-provided routine to print out
  
        /*
         * Optional platform-provided routine to print out

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/mm/44x_mmu.c powerpc.git/arch/ppc/mm/44x_mmu.c
---- linux-2.6.24/arch/ppc/mm/44x_mmu.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/mm/44x_mmu.c  2008-01-28 20:25:51.000000000 +0100
+--- a/arch/ppc/mm/44x_mmu.c
++++ b/arch/ppc/mm/44x_mmu.c

 @@ -60,38 +60,28 @@
   * Just needed it declared someplace.
   */
 @@ -60,38 +60,28 @@
   * Just needed it declared someplace.
   */


@@ -61318,9 +60925,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/mm/44x_mmu.c powerpc.git/a
  
        return total_lowmem;
  }
  
        return total_lowmem;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/mpc85xx_ads_common.c powerpc.git/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
---- linux-2.6.24/arch/ppc/platforms/85xx/mpc85xx_ads_common.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/platforms/85xx/mpc85xx_ads_common.c   2008-01-28 20:25:51.000000000 +0100
+--- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
++++ b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c

 @@ -42,8 +42,6 @@
  
  #include <mm/mmu_decl.h>
 @@ -42,8 +42,6 @@
  
  #include <mm/mmu_decl.h>


@@ -61338,9 +60944,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/mpc85xx_ads
  void platform_rio_init(void)
  {
        /* 512MB RIO LAW at 0xc0000000 */
  void platform_rio_init(void)
  {
        /* 512MB RIO LAW at 0xc0000000 */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/stx_gp3.c powerpc.git/arch/ppc/platforms/85xx/stx_gp3.c
---- linux-2.6.24/arch/ppc/platforms/85xx/stx_gp3.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/platforms/85xx/stx_gp3.c      2008-01-28 20:25:51.000000000 +0100
+--- a/arch/ppc/platforms/85xx/stx_gp3.c
++++ b/arch/ppc/platforms/85xx/stx_gp3.c

 @@ -50,12 +50,10 @@
  #include <asm/irq.h>
  #include <asm/immap_85xx.h>
 @@ -50,12 +50,10 @@
  #include <asm/irq.h>
  #include <asm/immap_85xx.h>


@@ -61362,9 +60967,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/stx_gp3.c p
  void
  platform_rio_init(void)
  {
  void
  platform_rio_init(void)
  {

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/tqm85xx.c powerpc.git/arch/ppc/platforms/85xx/tqm85xx.c
---- linux-2.6.24/arch/ppc/platforms/85xx/tqm85xx.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/platforms/85xx/tqm85xx.c      2008-01-28 20:25:51.000000000 +0100
+--- a/arch/ppc/platforms/85xx/tqm85xx.c
++++ b/arch/ppc/platforms/85xx/tqm85xx.c

 @@ -54,7 +54,6 @@
  #include <syslib/ppc85xx_setup.h>
  #include <syslib/cpm2_pic.h>
 @@ -54,7 +54,6 @@
  #include <syslib/ppc85xx_setup.h>
  #include <syslib/cpm2_pic.h>


@@ -61381,9 +60985,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/85xx/tqm85xx.c p
  void platform_rio_init(void)
  {
        /* 512MB RIO LAW at 0xc0000000 */
  void platform_rio_init(void)
  {
        /* 512MB RIO LAW at 0xc0000000 */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/ev64260.c powerpc.git/arch/ppc/platforms/ev64260.c
---- linux-2.6.24/arch/ppc/platforms/ev64260.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/platforms/ev64260.c   2008-01-28 20:25:51.000000000 +0100
+--- a/arch/ppc/platforms/ev64260.c
++++ b/arch/ppc/platforms/ev64260.c

 @@ -336,7 +336,7 @@
  #endif
  
 @@ -336,7 +336,7 @@
  #endif
  


@@ -61402,9 +61005,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/ev64260.c powerp
                "(source@mvista.com)\n", BOARD_VENDOR, BOARD_MACHINE);
  
        if (ppc_md.progress)
                "(source@mvista.com)\n", BOARD_VENDOR, BOARD_MACHINE);
  
        if (ppc_md.progress)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/prep_pci.c powerpc.git/arch/ppc/platforms/prep_pci.c
---- linux-2.6.24/arch/ppc/platforms/prep_pci.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/platforms/prep_pci.c  2008-01-28 20:25:52.000000000 +0100
+--- a/arch/ppc/platforms/prep_pci.c
++++ b/arch/ppc/platforms/prep_pci.c

 @@ -1099,7 +1099,6 @@
                                pci_write_config_byte(dev, 0x43, reg);
                        }
 @@ -1099,7 +1099,6 @@
                                pci_write_config_byte(dev, 0x43, reg);
                        }


@@ -61413,9 +61015,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/platforms/prep_pci.c power
        }
  
        if ((dev = pci_get_device(PCI_VENDOR_ID_WINBOND,
        }
  
        if ((dev = pci_get_device(PCI_VENDOR_ID_WINBOND,

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/Makefile powerpc.git/arch/ppc/syslib/Makefile
---- linux-2.6.24/arch/ppc/syslib/Makefile      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/Makefile       2008-01-28 20:25:52.000000000 +0100
+--- a/arch/ppc/syslib/Makefile
++++ b/arch/ppc/syslib/Makefile

 @@ -93,7 +93,6 @@
  ifeq ($(CONFIG_85xx),y)
  obj-$(CONFIG_PCI)             += pci_auto.o
 @@ -93,7 +93,6 @@
  ifeq ($(CONFIG_85xx),y)
  obj-$(CONFIG_PCI)             += pci_auto.o


@@ -61424,9 +61025,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/Makefile powerpc.gi
  obj-$(CONFIG_83xx)            += ppc83xx_setup.o ppc_sys.o \
                                        mpc83xx_sys.o mpc83xx_devices.o ipic.o
  ifeq ($(CONFIG_83xx),y)
  obj-$(CONFIG_83xx)            += ppc83xx_setup.o ppc_sys.o \
                                        mpc83xx_sys.o mpc83xx_devices.o ipic.o
  ifeq ($(CONFIG_83xx),y)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/gt64260_pic.c powerpc.git/arch/ppc/syslib/gt64260_pic.c
---- linux-2.6.24/arch/ppc/syslib/gt64260_pic.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/gt64260_pic.c  2008-01-28 20:25:52.000000000 +0100
+--- a/arch/ppc/syslib/gt64260_pic.c
++++ b/arch/ppc/syslib/gt64260_pic.c

 @@ -35,7 +35,6 @@
  #include <linux/interrupt.h>
  #include <linux/sched.h>
 @@ -35,7 +35,6 @@
  #include <linux/interrupt.h>
  #include <linux/sched.h>


@@ -61435,9 +61035,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/gt64260_pic.c power
  #include <linux/delay.h>
  #include <linux/irq.h>
  
  #include <linux/delay.h>
  #include <linux/irq.h>
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/mpc52xx_pic.c powerpc.git/arch/ppc/syslib/mpc52xx_pic.c
---- linux-2.6.24/arch/ppc/syslib/mpc52xx_pic.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/mpc52xx_pic.c  2008-01-28 20:25:52.000000000 +0100
+--- a/arch/ppc/syslib/mpc52xx_pic.c
++++ b/arch/ppc/syslib/mpc52xx_pic.c

 @@ -20,7 +20,6 @@
  #include <linux/init.h>
  #include <linux/sched.h>
 @@ -20,7 +20,6 @@
  #include <linux/init.h>
  #include <linux/sched.h>


@@ -61446,9 +61045,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/mpc52xx_pic.c power
  #include <linux/delay.h>
  #include <linux/irq.h>
  
  #include <linux/delay.h>
  #include <linux/irq.h>
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/mv64360_pic.c powerpc.git/arch/ppc/syslib/mv64360_pic.c
---- linux-2.6.24/arch/ppc/syslib/mv64360_pic.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/mv64360_pic.c  2008-01-28 20:25:52.000000000 +0100
+--- a/arch/ppc/syslib/mv64360_pic.c
++++ b/arch/ppc/syslib/mv64360_pic.c

 @@ -36,7 +36,6 @@
  #include <linux/init.h>
  #include <linux/sched.h>
 @@ -36,7 +36,6 @@
  #include <linux/init.h>
  #include <linux/sched.h>


@@ -61457,9 +61055,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/mv64360_pic.c power
  #include <linux/delay.h>
  #include <linux/irq.h>
  #include <linux/interrupt.h>
  #include <linux/delay.h>
  #include <linux/irq.h>
  #include <linux/interrupt.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ocp.c powerpc.git/arch/ppc/syslib/ocp.c
---- linux-2.6.24/arch/ppc/syslib/ocp.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ocp.c  2008-01-28 20:25:52.000000000 +0100
+--- a/arch/ppc/syslib/ocp.c
++++ b/arch/ppc/syslib/ocp.c

 @@ -376,7 +376,7 @@
  
        down_write(&ocp_devices_sem);
 @@ -376,7 +376,7 @@
  
        down_write(&ocp_devices_sem);


@@ -61469,9 +61066,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ocp.c powerpc.git/a
        up_write(&ocp_devices_sem);
  
        DBG(("ocp: ocp_remove_one_device(vendor: %x, function: %x, index: %d)... done.\n", vendor, function, index));
        up_write(&ocp_devices_sem);
  
        DBG(("ocp: ocp_remove_one_device(vendor: %x, function: %x, index: %d)... done.\n", vendor, function, index));

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc83xx_setup.c powerpc.git/arch/ppc/syslib/ppc83xx_setup.c
---- linux-2.6.24/arch/ppc/syslib/ppc83xx_setup.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ppc83xx_setup.c        2008-01-28 20:25:52.000000000 +0100
+--- a/arch/ppc/syslib/ppc83xx_setup.c
++++ b/arch/ppc/syslib/ppc83xx_setup.c

 @@ -41,7 +41,6 @@
  
  #include <syslib/ppc83xx_setup.h>
 @@ -41,7 +41,6 @@
  
  #include <syslib/ppc83xx_setup.h>


@@ -61480,9 +61076,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc83xx_setup.c pow
  #include <syslib/ppc83xx_pci.h>
  #endif
  
  #include <syslib/ppc83xx_pci.h>
  #endif
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.c powerpc.git/arch/ppc/syslib/ppc85xx_rio.c
---- linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ppc85xx_rio.c  1970-01-01 01:00:00.000000000 +0100
+--- a/arch/ppc/syslib/ppc85xx_rio.c
++++ /dev/null

 @@ -1,932 +0,0 @@
 -/*
 - * MPC85xx RapidIO support
 @@ -1,932 +0,0 @@
 -/*
 - * MPC85xx RapidIO support


@@ -62416,9 +62011,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.c power
 -      out_be32((void *)&dbell_atmu_regs->rowar, 0x8004200b);
 -      mpc85xx_rio_doorbell_init(port);
 -}
 -      out_be32((void *)&dbell_atmu_regs->rowar, 0x8004200b);
 -      mpc85xx_rio_doorbell_init(port);
 -}

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.h powerpc.git/arch/ppc/syslib/ppc85xx_rio.h
---- linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ppc85xx_rio.h  1970-01-01 01:00:00.000000000 +0100
+--- a/arch/ppc/syslib/ppc85xx_rio.h
++++ /dev/null

 @@ -1,20 +0,0 @@
 -/*
 - * MPC85xx RapidIO definitions
 @@ -1,20 +0,0 @@
 -/*
 - * MPC85xx RapidIO definitions


@@ -62440,9 +62034,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc85xx_rio.h power
 -extern void mpc85xx_rio_setup(int law_start, int law_size);
 -
 -#endif                                /* __PPC_SYSLIB_PPC85XX_RIO_H */
 -extern void mpc85xx_rio_setup(int law_start, int law_size);
 -
 -#endif                                /* __PPC_SYSLIB_PPC85XX_RIO_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc8xx_pic.c powerpc.git/arch/ppc/syslib/ppc8xx_pic.c
---- linux-2.6.24/arch/ppc/syslib/ppc8xx_pic.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ppc8xx_pic.c   2008-01-28 20:25:52.000000000 +0100
+--- a/arch/ppc/syslib/ppc8xx_pic.c
++++ b/arch/ppc/syslib/ppc8xx_pic.c

 @@ -16,7 +16,7 @@
   * the only interrupt controller.  Some boards, like the MBX and
   * Sandpoint have the 8259 as a secondary controller.  Depending
 @@ -16,7 +16,7 @@
   * the only interrupt controller.  Some boards, like the MBX and
   * Sandpoint have the 8259 as a secondary controller.  Depending


@@ -62452,9 +62045,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc8xx_pic.c powerp
   * "clear_bit()" and "set_bit()" functions like other platforms,
   * but they are overkill for us.
   */
   * "clear_bit()" and "set_bit()" functions like other platforms,
   * but they are overkill for us.
   */

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc_sys.c powerpc.git/arch/ppc/syslib/ppc_sys.c
---- linux-2.6.24/arch/ppc/syslib/ppc_sys.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/syslib/ppc_sys.c      2008-01-28 20:25:52.000000000 +0100
+--- a/arch/ppc/syslib/ppc_sys.c
++++ b/arch/ppc/syslib/ppc_sys.c

 @@ -185,7 +185,7 @@
   */
  
 @@ -185,7 +185,7 @@
   */
  


@@ -62464,9 +62056,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/syslib/ppc_sys.c powerpc.g
     Hereby, this should be called *before* any func stuff triggeded.
   */
  void ppc_sys_device_initfunc(void)
     Hereby, this should be called *before* any func stuff triggeded.
   */
  void ppc_sys_device_initfunc(void)

-diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/xmon/start.c powerpc.git/arch/ppc/xmon/start.c
---- linux-2.6.24/arch/ppc/xmon/start.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/arch/ppc/xmon/start.c  2008-01-28 20:25:52.000000000 +0100
+--- a/arch/ppc/xmon/start.c
++++ b/arch/ppc/xmon/start.c

 @@ -10,7 +10,6 @@
  #include <linux/sysrq.h>
  #include <linux/bitops.h>
 @@ -10,7 +10,6 @@
  #include <linux/sysrq.h>
  #include <linux/bitops.h>


@@ -62475,9 +62066,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/arch/ppc/xmon/start.c powerpc.git/a
  #include <asm/errno.h>
  #include <asm/processor.h>
  #include <asm/delay.h>
  #include <asm/errno.h>
  #include <asm/processor.h>
  #include <asm/delay.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/Kconfig powerpc.git/drivers/ata/Kconfig
---- linux-2.6.24/drivers/ata/Kconfig   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ata/Kconfig    2008-01-28 20:25:59.000000000 +0100
+--- a/drivers/ata/Kconfig
++++ b/drivers/ata/Kconfig

 @@ -607,13 +607,23 @@
  
  config PATA_PLATFORM
 @@ -607,13 +607,23 @@
  
  config PATA_PLATFORM


@@ -62503,9 +62093,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/Kconfig powerpc.git/dri
  config PATA_ICSIDE
        tristate "Acorn ICS PATA support"
        depends on ARM && ARCH_ACORN
  config PATA_ICSIDE
        tristate "Acorn ICS PATA support"
        depends on ARM && ARCH_ACORN

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/Makefile powerpc.git/drivers/ata/Makefile
---- linux-2.6.24/drivers/ata/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ata/Makefile   2008-01-28 20:25:59.000000000 +0100
+--- a/drivers/ata/Makefile
++++ b/drivers/ata/Makefile

 @@ -67,6 +67,7 @@
  obj-$(CONFIG_PATA_SCC)                += pata_scc.o
  obj-$(CONFIG_PATA_BF54X)      += pata_bf54x.o
 @@ -67,6 +67,7 @@
  obj-$(CONFIG_PATA_SCC)                += pata_scc.o
  obj-$(CONFIG_PATA_BF54X)      += pata_bf54x.o


@@ -62514,9 +62103,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/Makefile powerpc.git/dr
  obj-$(CONFIG_PATA_ICSIDE)     += pata_icside.o
  # Should be last but two libata driver
  obj-$(CONFIG_PATA_ACPI)               += pata_acpi.o
  obj-$(CONFIG_PATA_ICSIDE)     += pata_icside.o
  # Should be last but two libata driver
  obj-$(CONFIG_PATA_ACPI)               += pata_acpi.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_of_platform.c powerpc.git/drivers/ata/pata_of_platform.c
---- linux-2.6.24/drivers/ata/pata_of_platform.c        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/ata/pata_of_platform.c 2008-01-28 20:25:59.000000000 +0100
+--- /dev/null
++++ b/drivers/ata/pata_of_platform.c

 @@ -0,0 +1,114 @@
 +/*
 + * OF-platform PATA driver
 @@ -0,0 +1,114 @@
 +/*
 + * OF-platform PATA driver


@@ -62632,9 +62220,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_of_platform.c powe
 +MODULE_DESCRIPTION("OF-platform PATA driver");
 +MODULE_AUTHOR("Anton Vorontsov <avorontsov@ru.mvista.com>");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("OF-platform PATA driver");
 +MODULE_AUTHOR("Anton Vorontsov <avorontsov@ru.mvista.com>");
 +MODULE_LICENSE("GPL");

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_platform.c powerpc.git/drivers/ata/pata_platform.c
---- linux-2.6.24/drivers/ata/pata_platform.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ata/pata_platform.c    2008-01-28 20:25:59.000000000 +0100
+--- a/drivers/ata/pata_platform.c
++++ b/drivers/ata/pata_platform.c

 @@ -93,14 +93,9 @@
  };
  
 @@ -93,14 +93,9 @@
  };
  


@@ -62862,9 +62449,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ata/pata_platform.c powerpc
  
  static struct platform_driver pata_platform_driver = {
        .probe          = pata_platform_probe,
  
  static struct platform_driver pata_platform_driver = {
        .probe          = pata_platform_probe,

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/char/hw_random/Kconfig powerpc.git/drivers/char/hw_random/Kconfig
---- linux-2.6.24/drivers/char/hw_random/Kconfig        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/char/hw_random/Kconfig 2008-01-28 20:25:59.000000000 +0100
+--- a/drivers/char/hw_random/Kconfig
++++ b/drivers/char/hw_random/Kconfig

 @@ -98,7 +98,7 @@
        default HW_RANDOM
        ---help---
 @@ -98,7 +98,7 @@
        default HW_RANDOM
        ---help---


@@ -62874,9 +62460,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/char/hw_random/Kconfig powe
  
          To compile this driver as a module, choose M here: the
          module will be called pasemi-rng.
  
          To compile this driver as a module, choose M here: the
          module will be called pasemi-rng.

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/char/hw_random/pasemi-rng.c powerpc.git/drivers/char/hw_random/pasemi-rng.c
---- linux-2.6.24/drivers/char/hw_random/pasemi-rng.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/char/hw_random/pasemi-rng.c    2008-01-28 20:25:59.000000000 +0100
+--- a/drivers/char/hw_random/pasemi-rng.c
++++ b/drivers/char/hw_random/pasemi-rng.c

 @@ -126,10 +126,9 @@
  }
  
 @@ -126,10 +126,9 @@
  }
  


@@ -62891,9 +62476,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/char/hw_random/pasemi-rng.c
  };
  
  static struct of_platform_driver rng_driver = {
  };
  
  static struct of_platform_driver rng_driver = {

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/edac/pasemi_edac.c powerpc.git/drivers/edac/pasemi_edac.c
---- linux-2.6.24/drivers/edac/pasemi_edac.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/edac/pasemi_edac.c     2008-01-28 20:26:00.000000000 +0100
+--- a/drivers/edac/pasemi_edac.c
++++ b/drivers/edac/pasemi_edac.c

 @@ -225,7 +225,7 @@
                EDAC_FLAG_NONE;
        mci->mod_name = MODULE_NAME;
 @@ -225,7 +225,7 @@
                EDAC_FLAG_NONE;
        mci->mod_name = MODULE_NAME;


@@ -62909,9 +62493,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/edac/pasemi_edac.c powerpc.
  MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>");
 -MODULE_DESCRIPTION("MC support for PA Semi PA6T-1682M memory controller");
 +MODULE_DESCRIPTION("MC support for PA Semi PWRficient memory controller");
  MODULE_AUTHOR("Egor Martovetsky <egor@pasemi.com>");
 -MODULE_DESCRIPTION("MC support for PA Semi PA6T-1682M memory controller");
 +MODULE_DESCRIPTION("MC support for PA Semi PWRficient memory controller");

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git/drivers/macintosh/adb.c
---- linux-2.6.24/drivers/macintosh/adb.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/adb.c        2008-01-28 20:26:08.000000000 +0100
+--- a/drivers/macintosh/adb.c
++++ b/drivers/macintosh/adb.c

 @@ -35,6 +35,7 @@
  #include <linux/spinlock.h>
  #include <linux/completion.h>
 @@ -35,6 +35,7 @@
  #include <linux/spinlock.h>
  #include <linux/completion.h>


@@ -63214,9 +62797,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/adb.c powerpc.git
 +      platform_device_register(&adb_pfdev);
 +      platform_driver_probe(&adb_pfdrv, adb_dummy_probe);
  }
 +      platform_device_register(&adb_pfdev);
 +      platform_driver_probe(&adb_pfdrv, adb_dummy_probe);
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/mediabay.c powerpc.git/drivers/macintosh/mediabay.c
---- linux-2.6.24/drivers/macintosh/mediabay.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/mediabay.c   2008-01-28 20:26:08.000000000 +0100
+--- a/drivers/macintosh/mediabay.c
++++ b/drivers/macintosh/mediabay.c

 @@ -20,6 +20,7 @@
  #include <linux/stddef.h>
  #include <linux/init.h>
 @@ -20,6 +20,7 @@
  #include <linux/stddef.h>
  #include <linux/init.h>


@@ -63267,9 +62849,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/mediabay.c powerp
  
        return 0;
  
  
        return 0;
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_adt746x.c powerpc.git/drivers/macintosh/therm_adt746x.c
---- linux-2.6.24/drivers/macintosh/therm_adt746x.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/therm_adt746x.c      2008-01-28 20:26:08.000000000 +0100
+--- a/drivers/macintosh/therm_adt746x.c
++++ b/drivers/macintosh/therm_adt746x.c

 @@ -553,6 +553,7 @@
        struct device_node* np;
        const u32 *prop;
 @@ -553,6 +553,7 @@
        struct device_node* np;
        const u32 *prop;


@@ -63309,9 +62890,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_adt746x.c p
  
  #ifndef CONFIG_I2C_POWERMAC
        request_module("i2c-powermac");
  
  #ifndef CONFIG_I2C_POWERMAC
        request_module("i2c-powermac");

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powerpc.git/drivers/macintosh/therm_pm72.c
---- linux-2.6.24/drivers/macintosh/therm_pm72.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/therm_pm72.c 2008-01-28 20:26:08.000000000 +0100
+--- a/drivers/macintosh/therm_pm72.c
++++ b/drivers/macintosh/therm_pm72.c

 @@ -121,6 +121,7 @@
  #include <linux/reboot.h>
  #include <linux/kmod.h>
 @@ -121,6 +121,7 @@
  #include <linux/reboot.h>
  #include <linux/kmod.h>


@@ -63477,9 +63057,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_pm72.c powe
                wait_for_completion(&ctrl_complete);
  }
  
                wait_for_completion(&ctrl_complete);
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_windtunnel.c powerpc.git/drivers/macintosh/therm_windtunnel.c
---- linux-2.6.24/drivers/macintosh/therm_windtunnel.c  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/therm_windtunnel.c   2008-01-28 20:26:08.000000000 +0100
+--- a/drivers/macintosh/therm_windtunnel.c
++++ b/drivers/macintosh/therm_windtunnel.c

 @@ -36,6 +36,7 @@
  #include <linux/i2c.h>
  #include <linux/slab.h>
 @@ -36,6 +36,7 @@
  #include <linux/i2c.h>
  #include <linux/slab.h>


@@ -63580,9 +63159,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/therm_windtunnel.
                }
                if( client == x.thermostat )
                        x.thermostat = NULL;
                }
                if( client == x.thermostat )
                        x.thermostat = NULL;

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu-backlight.c powerpc.git/drivers/macintosh/via-pmu-backlight.c
---- linux-2.6.24/drivers/macintosh/via-pmu-backlight.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/via-pmu-backlight.c  2008-01-28 20:26:08.000000000 +0100
+--- a/drivers/macintosh/via-pmu-backlight.c
++++ b/drivers/macintosh/via-pmu-backlight.c

 @@ -22,7 +22,7 @@
  
  static void pmu_backlight_init_curve(u8 off, u8 min, u8 max)
 @@ -22,7 +22,7 @@
  
  static void pmu_backlight_init_curve(u8 off, u8 min, u8 max)


@@ -63678,9 +63256,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu-backlight
 -      return;
 +      printk(KERN_INFO "PMU Backlight initialized (%s)\n", name);
  }
 -      return;
 +      printk(KERN_INFO "PMU Backlight initialized (%s)\n", name);
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc.git/drivers/macintosh/via-pmu.c
---- linux-2.6.24/drivers/macintosh/via-pmu.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/macintosh/via-pmu.c    2008-01-28 20:26:08.000000000 +0100
+--- a/drivers/macintosh/via-pmu.c
++++ b/drivers/macintosh/via-pmu.c

 @@ -10,13 +10,11 @@
   *
   * Copyright (C) 1998 Paul Mackerras and Fabio Riccardi.
 @@ -10,13 +10,11 @@
   *
   * Copyright (C) 1998 Paul Mackerras and Fabio Riccardi.


@@ -64613,7 +64190,7 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
  EXPORT_SYMBOL(pmu_suspend);
  EXPORT_SYMBOL(pmu_resume);
  EXPORT_SYMBOL(pmu_unlock);
  EXPORT_SYMBOL(pmu_suspend);
  EXPORT_SYMBOL(pmu_resume);
  EXPORT_SYMBOL(pmu_unlock);

--#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
+-#if defined(CONFIG_PPC32)

 +#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
  EXPORT_SYMBOL(pmu_enable_irled);
  EXPORT_SYMBOL(pmu_battery_count);
 +#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
  EXPORT_SYMBOL(pmu_enable_irled);
  EXPORT_SYMBOL(pmu_battery_count);


@@ -64622,9 +64199,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/macintosh/via-pmu.c powerpc
 -#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 +#endif /* CONFIG_SUSPEND && CONFIG_PPC32 */
  
 -#endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
 +#endif /* CONFIG_SUSPEND && CONFIG_PPC32 */
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/fs_enet-main.c powerpc.git/drivers/net/fs_enet/fs_enet-main.c
---- linux-2.6.24/drivers/net/fs_enet/fs_enet-main.c    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/fs_enet/fs_enet-main.c     2008-01-28 20:26:12.000000000 +0100
+--- a/drivers/net/fs_enet/fs_enet-main.c
++++ b/drivers/net/fs_enet/fs_enet-main.c

 @@ -1178,8 +1178,15 @@
        struct device_node *phynode, *mdionode;
        struct resource res;
 @@ -1178,8 +1178,15 @@
        struct device_node *phynode, *mdionode;
        struct resource res;


@@ -64642,9 +64218,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/fs_enet-main.c
        if (!data || len != 4)
                return -EINVAL;
  
        if (!data || len != 4)
                return -EINVAL;
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/mac-fcc.c powerpc.git/drivers/net/fs_enet/mac-fcc.c
---- linux-2.6.24/drivers/net/fs_enet/mac-fcc.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/fs_enet/mac-fcc.c  2008-01-28 20:26:12.000000000 +0100
+--- a/drivers/net/fs_enet/mac-fcc.c
++++ b/drivers/net/fs_enet/mac-fcc.c

 @@ -81,16 +81,8 @@
  static inline int fcc_cr_cmd(struct fs_enet_private *fep, u32 op)
  {
 @@ -81,16 +81,8 @@
  static inline int fcc_cr_cmd(struct fs_enet_private *fep, u32 op)
  {


@@ -64663,9 +64238,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/mac-fcc.c power
  }
  
  static int do_pd_setup(struct fs_enet_private *fep)
  }
  
  static int do_pd_setup(struct fs_enet_private *fep)

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/mac-scc.c powerpc.git/drivers/net/fs_enet/mac-scc.c
---- linux-2.6.24/drivers/net/fs_enet/mac-scc.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/fs_enet/mac-scc.c  2008-01-28 20:26:12.000000000 +0100
+--- a/drivers/net/fs_enet/mac-scc.c
++++ b/drivers/net/fs_enet/mac-scc.c

 @@ -89,21 +89,12 @@
   * Delay to wait for SCC reset command to complete (in us)
   */
 @@ -89,21 +89,12 @@
   * Delay to wait for SCC reset command to complete (in us)
   */


@@ -64689,9 +64263,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/fs_enet/mac-scc.c power
  }
  
  static int do_pd_setup(struct fs_enet_private *fep)
  }
  
  static int do_pd_setup(struct fs_enet_private *fep)

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ibm_newemac/core.c powerpc.git/drivers/net/ibm_newemac/core.c
---- linux-2.6.24/drivers/net/ibm_newemac/core.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/ibm_newemac/core.c 2008-01-28 20:26:12.000000000 +0100
+--- a/drivers/net/ibm_newemac/core.c
++++ b/drivers/net/ibm_newemac/core.c

 @@ -37,6 +37,7 @@
  #include <linux/mii.h>
  #include <linux/bitops.h>
 @@ -37,6 +37,7 @@
  #include <linux/mii.h>
  #include <linux/bitops.h>


@@ -64700,9 +64273,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ibm_newemac/core.c powe
  
  #include <asm/processor.h>
  #include <asm/io.h>
  
  #include <asm/processor.h>
  #include <asm/io.h>

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/phy/Kconfig powerpc.git/drivers/net/phy/Kconfig
---- linux-2.6.24/drivers/net/phy/Kconfig       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/phy/Kconfig        2008-01-28 20:26:14.000000000 +0100
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig

 @@ -61,34 +61,12 @@
          Currently supports the IP175C PHY.
  
 @@ -61,34 +61,12 @@
          Currently supports the IP175C PHY.
  


@@ -64742,9 +64314,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/phy/Kconfig powerpc.git
  
  config MDIO_BITBANG
        tristate "Support for bitbanged MDIO buses"
  
  config MDIO_BITBANG
        tristate "Support for bitbanged MDIO buses"

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/phy/fixed.c powerpc.git/drivers/net/phy/fixed.c
---- linux-2.6.24/drivers/net/phy/fixed.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/phy/fixed.c        2008-01-28 20:26:14.000000000 +0100
+--- a/drivers/net/phy/fixed.c
++++ b/drivers/net/phy/fixed.c

 @@ -1,362 +1,253 @@
  /*
 - * drivers/net/phy/fixed.c
 @@ -1,362 +1,253 @@
  /*
 - * drivers/net/phy/fixed.c


@@ -65277,9 +64848,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/phy/fixed.c powerpc.git
 +MODULE_DESCRIPTION("Fixed MDIO bus (MDIO bus emulation with fixed PHYs)");
 +MODULE_AUTHOR("Vitaly Bordug");
 +MODULE_LICENSE("GPL");
 +MODULE_DESCRIPTION("Fixed MDIO bus (MDIO bus emulation with fixed PHYs)");
 +MODULE_AUTHOR("Vitaly Bordug");
 +MODULE_LICENSE("GPL");

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ps3_gelic_net.c powerpc.git/drivers/net/ps3_gelic_net.c
---- linux-2.6.24/drivers/net/ps3_gelic_net.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/ps3_gelic_net.c    2008-01-28 20:26:14.000000000 +0100
+--- a/drivers/net/ps3_gelic_net.c
++++ b/drivers/net/ps3_gelic_net.c

 @@ -58,11 +58,11 @@
  {
        return &card->dev->core;
 @@ -58,11 +58,11 @@
  {
        return &card->dev->core;


@@ -65294,9 +64864,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ps3_gelic_net.c powerpc
  {
        return card->dev->dev_id;
  }
  {
        return card->dev->dev_id;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ucc_geth.c powerpc.git/drivers/net/ucc_geth.c
---- linux-2.6.24/drivers/net/ucc_geth.c        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/net/ucc_geth.c 2008-01-28 20:26:14.000000000 +0100
+--- a/drivers/net/ucc_geth.c
++++ b/drivers/net/ucc_geth.c

 @@ -3822,6 +3822,7 @@
        int err, ucc_num, max_speed = 0;
        const phandle *ph;
 @@ -3822,6 +3822,7 @@
        int err, ucc_num, max_speed = 0;
        const phandle *ph;


@@ -65366,9 +64935,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/net/ucc_geth.c powerpc.git/
        err = of_address_to_resource(np, 0, &res);
        if (err)
                return -EINVAL;
        err = of_address_to_resource(np, 0, &res);
        if (err)
                return -EINVAL;

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/of/base.c powerpc.git/drivers/of/base.c
---- linux-2.6.24/drivers/of/base.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/of/base.c      2008-01-28 20:26:17.000000000 +0100
+--- a/drivers/of/base.c
++++ b/drivers/of/base.c

 @@ -273,3 +273,61 @@
        return np;
  }
 @@ -273,3 +273,61 @@
        return np;
  }


@@ -65431,9 +64999,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/of/base.c powerpc.git/drive
 +      return np;
 +}
 +EXPORT_SYMBOL(of_find_matching_node);
 +      return np;
 +}
 +EXPORT_SYMBOL(of_find_matching_node);

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/of/device.c powerpc.git/drivers/of/device.c
---- linux-2.6.24/drivers/of/device.c   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/of/device.c    2008-01-28 20:26:17.000000000 +0100
+--- a/drivers/of/device.c
++++ b/drivers/of/device.c

 @@ -10,35 +10,6 @@
  #include <asm/errno.h>
  
 @@ -10,35 +10,6 @@
  #include <asm/errno.h>
  


@@ -65470,17 +65037,15 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/of/device.c powerpc.git/dri
   * of_match_device - Tell if an of_device structure has a matching
   * of_match structure
   * @ids: array of of device match structures to search in
   * of_match_device - Tell if an of_device structure has a matching
   * of_match structure
   * @ids: array of of device match structures to search in

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/Makefile powerpc.git/drivers/ps3/Makefile
---- linux-2.6.24/drivers/ps3/Makefile  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ps3/Makefile   2008-01-28 20:26:18.000000000 +0100
+--- a/drivers/ps3/Makefile
++++ b/drivers/ps3/Makefile

 @@ -4,3 +4,4 @@
  obj-$(CONFIG_PPC_PS3) += sys-manager-core.o
  obj-$(CONFIG_PS3_SYS_MANAGER) += ps3-sys-manager.o
  obj-$(CONFIG_PS3_STORAGE) += ps3stor_lib.o
 +obj-$(CONFIG_PS3_LPM) += ps3-lpm.o
 @@ -4,3 +4,4 @@
  obj-$(CONFIG_PPC_PS3) += sys-manager-core.o
  obj-$(CONFIG_PS3_SYS_MANAGER) += ps3-sys-manager.o
  obj-$(CONFIG_PS3_STORAGE) += ps3stor_lib.o
 +obj-$(CONFIG_PS3_LPM) += ps3-lpm.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-lpm.c powerpc.git/drivers/ps3/ps3-lpm.c
---- linux-2.6.24/drivers/ps3/ps3-lpm.c 1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/ps3/ps3-lpm.c  2008-01-28 20:26:18.000000000 +0100
+--- /dev/null
++++ b/drivers/ps3/ps3-lpm.c

 @@ -0,0 +1,1248 @@
 +/*
 + * PS3 Logical Performance Monitor.
 @@ -0,0 +1,1248 @@
 +/*
 + * PS3 Logical Performance Monitor.


@@ -66730,9 +66295,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-lpm.c powerpc.git/d
 +MODULE_DESCRIPTION("PS3 Logical Performance Monitor Driver");
 +MODULE_AUTHOR("Sony Corporation");
 +MODULE_ALIAS(PS3_MODULE_ALIAS_LPM);
 +MODULE_DESCRIPTION("PS3 Logical Performance Monitor Driver");
 +MODULE_AUTHOR("Sony Corporation");
 +MODULE_ALIAS(PS3_MODULE_ALIAS_LPM);

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-sys-manager.c powerpc.git/drivers/ps3/ps3-sys-manager.c
---- linux-2.6.24/drivers/ps3/ps3-sys-manager.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ps3/ps3-sys-manager.c  2008-01-28 20:26:18.000000000 +0100
+--- a/drivers/ps3/ps3-sys-manager.c
++++ b/drivers/ps3/ps3-sys-manager.c

 @@ -452,7 +452,7 @@
        case PS3_SM_EVENT_THERMAL_ALERT:
                dev_dbg(&dev->core, "%s:%d: THERMAL_ALERT (zone %u)\n",
 @@ -452,7 +452,7 @@
        case PS3_SM_EVENT_THERMAL_ALERT:
                dev_dbg(&dev->core, "%s:%d: THERMAL_ALERT (zone %u)\n",


@@ -66784,9 +66348,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-sys-manager.c power
                ps3_sys_manager_handle_msg(dev);
  }
  
                ps3_sys_manager_handle_msg(dev);
  }
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git/drivers/ps3/ps3-vuart.c
---- linux-2.6.24/drivers/ps3/ps3-vuart.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/ps3/ps3-vuart.c        2008-01-28 20:26:18.000000000 +0100
+--- a/drivers/ps3/ps3-vuart.c
++++ b/drivers/ps3/ps3-vuart.c

 @@ -108,18 +108,18 @@
  struct ports_bmp {
        u64 status;
 @@ -108,18 +108,18 @@
  struct ports_bmp {
        u64 status;


@@ -66948,9 +66511,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/ps3/ps3-vuart.c powerpc.git
  
        return 0;
  }
  
        return 0;
  }

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/Kconfig powerpc.git/drivers/serial/Kconfig
---- linux-2.6.24/drivers/serial/Kconfig        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/Kconfig 2008-01-28 20:26:19.000000000 +0100
+--- a/drivers/serial/Kconfig
++++ b/drivers/serial/Kconfig

 @@ -1284,4 +1284,14 @@
          Currently, only 8250 compatible ports are supported, but
          others can easily be added.
 @@ -1284,4 +1284,14 @@
          Currently, only 8250 compatible ports are supported, but
          others can easily be added.


@@ -66966,17 +66528,15 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/Kconfig powerpc.git/
 +        PowerPC that contain a QUICC Engine.
 +
  endmenu
 +        PowerPC that contain a QUICC Engine.
 +
  endmenu

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/Makefile powerpc.git/drivers/serial/Makefile
---- linux-2.6.24/drivers/serial/Makefile       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/Makefile        2008-01-28 20:26:19.000000000 +0100
+--- a/drivers/serial/Makefile
++++ b/drivers/serial/Makefile

 @@ -64,3 +64,4 @@
  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 +obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
 @@ -64,3 +64,4 @@
  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 +obj-$(CONFIG_SERIAL_QE) += ucc_uart.o

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cpm1.c powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm1.c
---- linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cpm1.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm1.c        2008-01-28 20:26:19.000000000 +0100
+--- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c
++++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c

 @@ -52,11 +52,7 @@
  #ifdef CONFIG_PPC_CPM_NEW_BINDING
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
 @@ -52,11 +52,7 @@
  #ifdef CONFIG_PPC_CPM_NEW_BINDING
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)


@@ -66990,9 +66550,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cp
  }
  #else
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
  }
  #else
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cpm2.c powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm2.c
---- linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cpm2.c       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/cpm_uart/cpm_uart_cpm2.c        2008-01-28 20:26:19.000000000 +0100
+--- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c
++++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c

 @@ -52,13 +52,7 @@
  #ifdef CONFIG_PPC_CPM_NEW_BINDING
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)
 @@ -52,13 +52,7 @@
  #ifdef CONFIG_PPC_CPM_NEW_BINDING
  void cpm_line_cr_cmd(struct uart_cpm_port *port, int cmd)


@@ -67019,9 +66578,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/cpm_uart/cpm_uart_cp
  
        io->iop_pparb |= 0x008b0000;
        io->iop_pdirb |= 0x00880000;
  
        io->iop_pparb |= 0x008b0000;
        io->iop_pdirb |= 0x00880000;

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c powerpc.git/drivers/serial/mpc52xx_uart.c
---- linux-2.6.24/drivers/serial/mpc52xx_uart.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/mpc52xx_uart.c  2008-01-28 20:26:19.000000000 +0100
+--- a/drivers/serial/mpc52xx_uart.c
++++ b/drivers/serial/mpc52xx_uart.c

 @@ -36,7 +36,7 @@
   * DCD. However, the pin multiplexing aren't changed and should be set either
   * by the bootloader or in the platform init code.
 @@ -36,7 +36,7 @@
   * DCD. However, the pin multiplexing aren't changed and should be set either
   * by the bootloader or in the platform init code.


@@ -67603,9 +67161,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/mpc52xx_uart.c power
                printk(KERN_ERR "%s: uart_register_driver failed (%i)\n",
                       __FILE__, ret);
                return ret;
                printk(KERN_ERR "%s: uart_register_driver failed (%i)\n",
                       __FILE__, ret);
                return ret;

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/uartlite.c powerpc.git/drivers/serial/uartlite.c
---- linux-2.6.24/drivers/serial/uartlite.c     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/serial/uartlite.c      2008-01-28 20:26:19.000000000 +0100
+--- a/drivers/serial/uartlite.c
++++ b/drivers/serial/uartlite.c

 @@ -539,7 +539,7 @@
   *
   * @dev: pointer to device structure
 @@ -539,7 +539,7 @@
   *
   * @dev: pointer to device structure


@@ -67632,9 +67189,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/uartlite.c powerpc.g
        .driver = {
                   .owner = THIS_MODULE,
                   .name  = "uartlite",
        .driver = {
                   .owner = THIS_MODULE,
                   .name  = "uartlite",

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/ucc_uart.c powerpc.git/drivers/serial/ucc_uart.c
---- linux-2.6.24/drivers/serial/ucc_uart.c     1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/drivers/serial/ucc_uart.c      2008-01-28 20:26:20.000000000 +0100
+--- /dev/null
++++ b/drivers/serial/ucc_uart.c

 @@ -0,0 +1,1514 @@
 +/*
 + * Freescale QUICC Engine UART device driver
 @@ -0,0 +1,1514 @@
 +/*
 + * Freescale QUICC Engine UART device driver


@@ -69150,9 +68706,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/serial/ucc_uart.c powerpc.g
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_QE_MAJOR);
 +
 +MODULE_LICENSE("GPL v2");
 +MODULE_ALIAS_CHARDEV_MAJOR(SERIAL_QE_MAJOR);
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/spi/mpc52xx_psc_spi.c powerpc.git/drivers/spi/mpc52xx_psc_spi.c
---- linux-2.6.24/drivers/spi/mpc52xx_psc_spi.c 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/drivers/spi/mpc52xx_psc_spi.c  2008-01-28 20:26:20.000000000 +0100
+--- a/drivers/spi/mpc52xx_psc_spi.c
++++ b/drivers/spi/mpc52xx_psc_spi.c

 @@ -330,6 +330,7 @@
  
  static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)
 @@ -330,6 +330,7 @@
  
  static int mpc52xx_psc_spi_port_config(int psc_id, struct mpc52xx_psc_spi *mps)


@@ -69176,9 +68731,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/drivers/spi/mpc52xx_psc_spi.c power
  #else
        cdm = ioremap(MPC52xx_PA(MPC52xx_CDM_OFFSET), MPC52xx_CDM_SIZE);
        gpio = ioremap(MPC52xx_PA(MPC52xx_GPIO_OFFSET), MPC52xx_GPIO_SIZE);
  #else
        cdm = ioremap(MPC52xx_PA(MPC52xx_CDM_OFFSET), MPC52xx_CDM_SIZE);
        gpio = ioremap(MPC52xx_PA(MPC52xx_GPIO_OFFSET), MPC52xx_GPIO_SIZE);

-diff -x .git -x .gitignore -Nur linux-2.6.24/fs/openpromfs/inode.c powerpc.git/fs/openpromfs/inode.c
---- linux-2.6.24/fs/openpromfs/inode.c 2008-01-28 20:50:11.000000000 +0100
-+++ powerpc.git/fs/openpromfs/inode.c  2008-01-28 20:26:31.000000000 +0100
+--- a/fs/openpromfs/inode.c
++++ b/fs/openpromfs/inode.c

 @@ -131,7 +131,7 @@
        /* Nothing to do */
  }
 @@ -131,7 +131,7 @@
        /* Nothing to do */
  }


@@ -69188,9 +68742,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/fs/openpromfs/inode.c powerpc.git/f
        .start          = property_start,
        .next           = property_next,
        .stop           = property_stop,
        .start          = property_start,
        .next           = property_next,
        .stop           = property_stop,

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/8xx_immap.h powerpc.git/include/asm-powerpc/8xx_immap.h
---- linux-2.6.24/include/asm-powerpc/8xx_immap.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/8xx_immap.h        2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/8xx_immap.h
++++ b/include/asm-powerpc/8xx_immap.h

 @@ -123,7 +123,7 @@
  #define OR_G5LA               0x00000400      /* Output #GPL5 on #GPL_A5              */
  #define OR_G5LS               0x00000200      /* Drive #GPL high on falling edge of...*/
 @@ -123,7 +123,7 @@
  #define OR_G5LA               0x00000400      /* Output #GPL5 on #GPL_A5              */
  #define OR_G5LS               0x00000200      /* Drive #GPL high on falling edge of...*/


@@ -69200,9 +68753,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/8xx_immap.h pow
  #define OR_SCY_0_CLK  0x00000000      /* 0 clock cycles wait states           */
  #define OR_SCY_1_CLK  0x00000010      /* 1 clock cycles wait states           */
  #define OR_SCY_2_CLK  0x00000020      /* 2 clock cycles wait states           */
  #define OR_SCY_0_CLK  0x00000000      /* 0 clock cycles wait states           */
  #define OR_SCY_1_CLK  0x00000010      /* 1 clock cycles wait states           */
  #define OR_SCY_2_CLK  0x00000020      /* 2 clock cycles wait states           */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/commproc.h powerpc.git/include/asm-powerpc/commproc.h
---- linux-2.6.24/include/asm-powerpc/commproc.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/commproc.h 2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/commproc.h
++++ b/include/asm-powerpc/commproc.h

 @@ -693,7 +693,7 @@
  #define       CICR_SCC_SCC3           ((uint)0x00200000)      /* SCC3 @ SCCc */
  #define       CICR_SCB_SCC2           ((uint)0x00040000)      /* SCC2 @ SCCb */
 @@ -693,7 +693,7 @@
  #define       CICR_SCC_SCC3           ((uint)0x00200000)      /* SCC3 @ SCCc */
  #define       CICR_SCB_SCC2           ((uint)0x00040000)      /* SCC2 @ SCCb */


@@ -69212,9 +68764,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/commproc.h powe
  #define CICR_HP_MASK          ((uint)0x00001f00)      /* Hi-pri int. */
  #define CICR_IEN              ((uint)0x00000080)      /* Int. enable */
  #define CICR_SPS              ((uint)0x00000001)      /* SCC Spread */
  #define CICR_HP_MASK          ((uint)0x00001f00)      /* Hi-pri int. */
  #define CICR_IEN              ((uint)0x00000080)      /* Int. enable */
  #define CICR_SPS              ((uint)0x00000001)      /* SCC Spread */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cpm.h powerpc.git/include/asm-powerpc/cpm.h
---- linux-2.6.24/include/asm-powerpc/cpm.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/cpm.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/cpm.h
++++ b/include/asm-powerpc/cpm.h

 @@ -10,5 +10,6 @@
  unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size);
  void __iomem *cpm_muram_addr(unsigned long offset);
 @@ -10,5 +10,6 @@
  unsigned long cpm_muram_alloc_fixed(unsigned long offset, unsigned long size);
  void __iomem *cpm_muram_addr(unsigned long offset);


@@ -69222,9 +68773,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cpm.h powerpc.g
 +int cpm_command(u32 command, u8 opcode);
  
  #endif
 +int cpm_command(u32 command, u8 opcode);
  
  #endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cputable.h powerpc.git/include/asm-powerpc/cputable.h
---- linux-2.6.24/include/asm-powerpc/cputable.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/cputable.h 2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/cputable.h
++++ b/include/asm-powerpc/cputable.h

 @@ -57,6 +57,14 @@
        PPC_PMC_PA6T = 2,
  };
 @@ -57,6 +57,14 @@
        PPC_PMC_PA6T = 2,
  };


@@ -69252,9 +68802,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cputable.h powe
  };
  
  extern struct cpu_spec                *cur_cpu_spec;
  };
  
  extern struct cpu_spec                *cur_cpu_spec;

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cputhreads.h powerpc.git/include/asm-powerpc/cputhreads.h
---- linux-2.6.24/include/asm-powerpc/cputhreads.h      1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/cputhreads.h       2008-01-28 20:26:42.000000000 +0100
+--- /dev/null
++++ b/include/asm-powerpc/cputhreads.h

 @@ -0,0 +1,71 @@
 +#ifndef _ASM_POWERPC_CPUTHREADS_H
 +#define _ASM_POWERPC_CPUTHREADS_H
 @@ -0,0 +1,71 @@
 +#ifndef _ASM_POWERPC_CPUTHREADS_H
 +#define _ASM_POWERPC_CPUTHREADS_H


@@ -69327,9 +68876,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/cputhreads.h po
 +
 +#endif /* _ASM_POWERPC_CPUTHREADS_H */
 +
 +
 +#endif /* _ASM_POWERPC_CPUTHREADS_H */
 +

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dcr-native.h powerpc.git/include/asm-powerpc/dcr-native.h
---- linux-2.6.24/include/asm-powerpc/dcr-native.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/dcr-native.h       2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/dcr-native.h
++++ b/include/asm-powerpc/dcr-native.h

 @@ -22,6 +22,8 @@
  #ifdef __KERNEL__
  #ifndef __ASSEMBLY__
 @@ -22,6 +22,8 @@
  #ifdef __KERNEL__
  #ifndef __ASSEMBLY__


@@ -69378,9 +68926,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dcr-native.h po
  #endif /* _ASM_POWERPC_DCR_NATIVE_H */
 -
 -
  #endif /* _ASM_POWERPC_DCR_NATIVE_H */
 -
 -

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dcr-regs.h powerpc.git/include/asm-powerpc/dcr-regs.h
---- linux-2.6.24/include/asm-powerpc/dcr-regs.h        1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/dcr-regs.h 2008-01-28 20:26:42.000000000 +0100
+--- /dev/null
++++ b/include/asm-powerpc/dcr-regs.h

 @@ -0,0 +1,71 @@
 +/*
 + * Common DCR / SDR / CPR register definitions used on various IBM/AMCC
 @@ -0,0 +1,71 @@
 +/*
 + * Common DCR / SDR / CPR register definitions used on various IBM/AMCC


@@ -69453,9 +69000,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dcr-regs.h powe
 +#define SDR0_CUST0            0x4000
 +
 +#endif /* __DCR_REGS_H__ */
 +#define SDR0_CUST0            0x4000
 +
 +#endif /* __DCR_REGS_H__ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dma-mapping.h powerpc.git/include/asm-powerpc/dma-mapping.h
---- linux-2.6.24/include/asm-powerpc/dma-mapping.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/dma-mapping.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/dma-mapping.h
++++ b/include/asm-powerpc/dma-mapping.h

 @@ -87,6 +87,9 @@
        return dma_ops->dma_supported(dev, mask);
  }
 @@ -87,6 +87,9 @@
        return dma_ops->dma_supported(dev, mask);
  }


@@ -69475,9 +69021,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/dma-mapping.h p
  #else /* CONFIG_PPC64 */
  
  #define dma_supported(dev, mask)      (1)
  #else /* CONFIG_PPC64 */
  
  #define dma_supported(dev, mask)      (1)

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/firmware.h powerpc.git/include/asm-powerpc/firmware.h
---- linux-2.6.24/include/asm-powerpc/firmware.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/firmware.h 2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/firmware.h
++++ b/include/asm-powerpc/firmware.h

 @@ -64,7 +64,7 @@
        FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
        FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
 @@ -64,7 +64,7 @@
        FW_FEATURE_PS3_POSSIBLE = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,
        FW_FEATURE_PS3_ALWAYS = FW_FEATURE_LPAR | FW_FEATURE_PS3_LV1,


@@ -69487,9 +69032,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/firmware.h powe
        FW_FEATURE_NATIVE_POSSIBLE = 0,
        FW_FEATURE_NATIVE_ALWAYS = 0,
        FW_FEATURE_POSSIBLE =
        FW_FEATURE_NATIVE_POSSIBLE = 0,
        FW_FEATURE_NATIVE_ALWAYS = 0,
        FW_FEATURE_POSSIBLE =

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/immap_86xx.h powerpc.git/include/asm-powerpc/immap_86xx.h
---- linux-2.6.24/include/asm-powerpc/immap_86xx.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/immap_86xx.h       2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/immap_86xx.h
++++ b/include/asm-powerpc/immap_86xx.h

 @@ -89,14 +89,14 @@
   * them.
   *
 @@ -89,14 +89,14 @@
   * them.
   *


@@ -69535,9 +69079,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/immap_86xx.h po
  #define CCSR_GUTS_CLKDVDR_PXCKEN      0x80000000
  #define CCSR_GUTS_CLKDVDR_SSICKEN     0x20000000
  #define CCSR_GUTS_CLKDVDR_PXCKINV     0x10000000
  #define CCSR_GUTS_CLKDVDR_PXCKEN      0x80000000
  #define CCSR_GUTS_CLKDVDR_SSICKEN     0x20000000
  #define CCSR_GUTS_CLKDVDR_PXCKINV     0x10000000

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/immap_qe.h powerpc.git/include/asm-powerpc/immap_qe.h
---- linux-2.6.24/include/asm-powerpc/immap_qe.h        2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/immap_qe.h 2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/immap_qe.h
++++ b/include/asm-powerpc/immap_qe.h

 @@ -393,9 +393,39 @@
        u8      res2[0x48];
  } __attribute__ ((packed));
 @@ -393,9 +393,39 @@
        u8      res2[0x48];
  } __attribute__ ((packed));


@@ -69580,9 +69123,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/immap_qe.h powe
  } __attribute__ ((packed));
  
  struct qe_immap {
  } __attribute__ ((packed));
  
  struct qe_immap {

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/io.h powerpc.git/include/asm-powerpc/io.h
---- linux-2.6.24/include/asm-powerpc/io.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/io.h       2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/io.h
++++ b/include/asm-powerpc/io.h

 @@ -50,15 +50,16 @@
  #define PCI_DRAM_OFFSET       pci_dram_offset
  #else
 @@ -50,15 +50,16 @@
  #define PCI_DRAM_OFFSET       pci_dram_offset
  #else


@@ -69602,9 +69144,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/io.h powerpc.gi
  #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_INDIRECT_IO)
  #error CONFIG_PPC_INDIRECT_IO is not yet supported on 32 bits
  #endif
  #if defined(CONFIG_PPC32) && defined(CONFIG_PPC_INDIRECT_IO)
  #error CONFIG_PPC_INDIRECT_IO is not yet supported on 32 bits
  #endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/iommu.h powerpc.git/include/asm-powerpc/iommu.h
---- linux-2.6.24/include/asm-powerpc/iommu.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/iommu.h    2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/iommu.h
++++ b/include/asm-powerpc/iommu.h

 @@ -69,10 +69,9 @@
  };
  
 @@ -69,10 +69,9 @@
  };
  


@@ -69617,9 +69158,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/iommu.h powerpc
  
  /* Initializes an iommu_table based in values set in the passed-in
   * structure
  
  /* Initializes an iommu_table based in values set in the passed-in
   * structure

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ipic.h powerpc.git/include/asm-powerpc/ipic.h
---- linux-2.6.24/include/asm-powerpc/ipic.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/ipic.h     2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/ipic.h
++++ b/include/asm-powerpc/ipic.h

 @@ -20,11 +20,13 @@
  
  /* Flags when we init the IPIC */
 @@ -20,11 +20,13 @@
  
  /* Flags when we init the IPIC */


@@ -69639,9 +69179,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ipic.h powerpc.
  
  /* IPIC registers offsets */
  #define IPIC_SICFR    0x00    /* System Global Interrupt Configuration Register */
  
  /* IPIC registers offsets */
  #define IPIC_SICFR    0x00    /* System Global Interrupt Configuration Register */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/iseries/hv_lp_event.h powerpc.git/include/asm-powerpc/iseries/hv_lp_event.h
---- linux-2.6.24/include/asm-powerpc/iseries/hv_lp_event.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/iseries/hv_lp_event.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/iseries/hv_lp_event.h
++++ b/include/asm-powerpc/iseries/hv_lp_event.h

 @@ -78,7 +78,7 @@
  
  /*
 @@ -78,7 +78,7 @@
  
  /*


@@ -69651,9 +69190,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/iseries/hv_lp_e
   */
  extern int HvLpEvent_closePath(HvLpEvent_Type eventType, HvLpIndex lpIndex);
  
   */
  extern int HvLpEvent_closePath(HvLpEvent_Type eventType, HvLpIndex lpIndex);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/kexec.h powerpc.git/include/asm-powerpc/kexec.h
---- linux-2.6.24/include/asm-powerpc/kexec.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/kexec.h    2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/kexec.h
++++ b/include/asm-powerpc/kexec.h

 @@ -123,6 +123,9 @@
  extern void default_machine_kexec(struct kimage *image);
  extern int default_machine_kexec_prepare(struct kimage *image);
 @@ -123,6 +123,9 @@
  extern void default_machine_kexec(struct kimage *image);
  extern int default_machine_kexec_prepare(struct kimage *image);


@@ -69664,9 +69202,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/kexec.h powerpc
  
  extern void machine_kexec_simple(struct kimage *image);
  extern void crash_kexec_secondary(struct pt_regs *regs);
  
  extern void machine_kexec_simple(struct kimage *image);
  extern void crash_kexec_secondary(struct pt_regs *regs);

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/lmb.h powerpc.git/include/asm-powerpc/lmb.h
---- linux-2.6.24/include/asm-powerpc/lmb.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/lmb.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/lmb.h
++++ b/include/asm-powerpc/lmb.h

 @@ -51,6 +51,7 @@
  extern unsigned long __init lmb_phys_mem_size(void);
  extern unsigned long __init lmb_end_of_DRAM(void);
 @@ -51,6 +51,7 @@
  extern unsigned long __init lmb_phys_mem_size(void);
  extern unsigned long __init lmb_end_of_DRAM(void);


@@ -69675,9 +69212,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/lmb.h powerpc.g
  
  extern void lmb_dump_all(void);
  
  
  extern void lmb_dump_all(void);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/machdep.h powerpc.git/include/asm-powerpc/machdep.h
---- linux-2.6.24/include/asm-powerpc/machdep.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/machdep.h  2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/machdep.h
++++ b/include/asm-powerpc/machdep.h

 @@ -204,6 +204,13 @@
        /*
         * optional PCI "hooks"
 @@ -204,6 +204,13 @@
        /*
         * optional PCI "hooks"


@@ -69763,9 +69299,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/machdep.h power
 +
  #endif /* __KERNEL__ */
  #endif /* _ASM_POWERPC_MACHDEP_H */
 +
  #endif /* __KERNEL__ */
  #endif /* _ASM_POWERPC_MACHDEP_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mmu-hash64.h powerpc.git/include/asm-powerpc/mmu-hash64.h
---- linux-2.6.24/include/asm-powerpc/mmu-hash64.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/mmu-hash64.h       2008-01-28 21:37:04.000000000 +0100
+--- a/include/asm-powerpc/mmu-hash64.h
++++ b/include/asm-powerpc/mmu-hash64.h

 @@ -80,7 +80,7 @@
  #define HPTE_V_AVPN_SHIFT     7
  #define HPTE_V_AVPN           ASM_CONST(0x3fffffffffffff80)
 @@ -80,7 +80,7 @@
  #define HPTE_V_AVPN_SHIFT     7
  #define HPTE_V_AVPN           ASM_CONST(0x3fffffffffffff80)


@@ -69791,9 +69326,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mmu-hash64.h po
  
  extern void htab_initialize(void);
  extern void htab_initialize_secondary(void);
  
  extern void htab_initialize(void);
  extern void htab_initialize_secondary(void);

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc52xx.h powerpc.git/include/asm-powerpc/mpc52xx.h
---- linux-2.6.24/include/asm-powerpc/mpc52xx.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/mpc52xx.h  2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/mpc52xx.h
++++ b/include/asm-powerpc/mpc52xx.h

 @@ -248,8 +248,6 @@
  
  #ifndef __ASSEMBLY__
 @@ -248,8 +248,6 @@
  
  #ifndef __ASSEMBLY__


@@ -69816,9 +69350,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc52xx.h power
  
  extern void __init mpc52xx_map_wdt(void);
  extern void mpc52xx_restart(char *cmd);
  
  extern void __init mpc52xx_map_wdt(void);
  extern void mpc52xx_restart(char *cmd);

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc52xx_psc.h powerpc.git/include/asm-powerpc/mpc52xx_psc.h
---- linux-2.6.24/include/asm-powerpc/mpc52xx_psc.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/mpc52xx_psc.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/mpc52xx_psc.h
++++ b/include/asm-powerpc/mpc52xx_psc.h

 @@ -153,6 +153,9 @@
        u8              reserved16[3];
        u8              irfdr;          /* PSC + 0x54 */
 @@ -153,6 +153,9 @@
        u8              reserved16[3];
        u8              irfdr;          /* PSC + 0x54 */


@@ -69829,9 +69362,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc52xx_psc.h p
        u16             rfnum;          /* PSC + 0x58 */
        u16             reserved18;
        u16             tfnum;          /* PSC + 0x5c */
        u16             rfnum;          /* PSC + 0x58 */
        u16             reserved18;
        u16             tfnum;          /* PSC + 0x5c */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc8260.h powerpc.git/include/asm-powerpc/mpc8260.h
---- linux-2.6.24/include/asm-powerpc/mpc8260.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/mpc8260.h  2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/mpc8260.h
++++ b/include/asm-powerpc/mpc8260.h

 @@ -8,6 +8,7 @@
  #ifndef __ASM_POWERPC_MPC8260_H__
  #define __ASM_POWERPC_MPC8260_H__
 @@ -8,6 +8,7 @@
  #ifndef __ASM_POWERPC_MPC8260_H__
  #define __ASM_POWERPC_MPC8260_H__


@@ -69840,9 +69372,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpc8260.h power
  
  #ifdef CONFIG_8260
  
  
  #ifdef CONFIG_8260
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpic.h powerpc.git/include/asm-powerpc/mpic.h
---- linux-2.6.24/include/asm-powerpc/mpic.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/mpic.h     2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/mpic.h
++++ b/include/asm-powerpc/mpic.h

 @@ -22,7 +22,9 @@
  #define MPIC_GREG_GLOBAL_CONF_0               0x00020
  #define               MPIC_GREG_GCONF_RESET                   0x80000000
 @@ -22,7 +22,9 @@
  #define MPIC_GREG_GLOBAL_CONF_0               0x00020
  #define               MPIC_GREG_GCONF_RESET                   0x80000000


@@ -69909,9 +69440,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/mpic.h powerpc.
  
  /* Set the EPIC clock ratio */
  void mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio);
  
  /* Set the EPIC clock ratio */
  void mpic_set_clk_ratio(struct mpic *mpic, u32 clock_ratio);

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/nvram.h powerpc.git/include/asm-powerpc/nvram.h
---- linux-2.6.24/include/asm-powerpc/nvram.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/nvram.h    2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/nvram.h
++++ b/include/asm-powerpc/nvram.h

 @@ -10,6 +10,8 @@
  #ifndef _ASM_POWERPC_NVRAM_H
  #define _ASM_POWERPC_NVRAM_H
 @@ -10,6 +10,8 @@
  #ifndef _ASM_POWERPC_NVRAM_H
  #define _ASM_POWERPC_NVRAM_H


@@ -69938,9 +69468,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/nvram.h powerpc
  #endif /* __KERNEL__ */
  
  /* PowerMac specific nvram stuffs */
  #endif /* __KERNEL__ */
  
  /* PowerMac specific nvram stuffs */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/of_platform.h powerpc.git/include/asm-powerpc/of_platform.h
---- linux-2.6.24/include/asm-powerpc/of_platform.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/of_platform.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/of_platform.h
++++ b/include/asm-powerpc/of_platform.h

 @@ -15,8 +15,14 @@
  #include <linux/of_platform.h>
  
 @@ -15,8 +15,14 @@
  #include <linux/of_platform.h>
  


@@ -69971,9 +69500,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/of_platform.h p
 +extern void of_instantiate_rtc(void);
 +
  #endif        /* _ASM_POWERPC_OF_PLATFORM_H */
 +extern void of_instantiate_rtc(void);
 +
  #endif        /* _ASM_POWERPC_OF_PLATFORM_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h powerpc.git/include/asm-powerpc/pci-bridge.h
---- linux-2.6.24/include/asm-powerpc/pci-bridge.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/pci-bridge.h       2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/pci-bridge.h
++++ b/include/asm-powerpc/pci-bridge.h

 @@ -1,15 +1,42 @@
  #ifndef _ASM_POWERPC_PCI_BRIDGE_H
  #define _ASM_POWERPC_PCI_BRIDGE_H
 @@ -1,15 +1,42 @@
  #ifndef _ASM_POWERPC_PCI_BRIDGE_H
  #define _ASM_POWERPC_PCI_BRIDGE_H


@@ -70296,9 +69824,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci-bridge.h po
 -#endif
 +#endif        /* __KERNEL__ */
 +#endif        /* _ASM_POWERPC_PCI_BRIDGE_H */
 -#endif
 +#endif        /* __KERNEL__ */
 +#endif        /* _ASM_POWERPC_PCI_BRIDGE_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci.h powerpc.git/include/asm-powerpc/pci.h
---- linux-2.6.24/include/asm-powerpc/pci.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/pci.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/pci.h
++++ b/include/asm-powerpc/pci.h

 @@ -36,11 +36,10 @@
  
  /*
 @@ -36,11 +36,10 @@
  
  /*


@@ -70371,9 +69898,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/pci.h powerpc.g
 +
  #endif        /* __KERNEL__ */
  #endif /* __ASM_POWERPC_PCI_H */
 +
  #endif        /* __KERNEL__ */
  #endif /* __ASM_POWERPC_PCI_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ppc-pci.h powerpc.git/include/asm-powerpc/ppc-pci.h
---- linux-2.6.24/include/asm-powerpc/ppc-pci.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/ppc-pci.h  2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/ppc-pci.h
++++ b/include/asm-powerpc/ppc-pci.h

 @@ -22,7 +22,6 @@
  
  
 @@ -22,7 +22,6 @@
  
  


@@ -70392,9 +69918,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ppc-pci.h power
  extern unsigned long pci_probe_only;
  
  /* ---- EEH internal-use-only related routines ---- */
  extern unsigned long pci_probe_only;
  
  /* ---- EEH internal-use-only related routines ---- */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/prom.h powerpc.git/include/asm-powerpc/prom.h
---- linux-2.6.24/include/asm-powerpc/prom.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/prom.h     2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/prom.h
++++ b/include/asm-powerpc/prom.h

 @@ -202,6 +202,10 @@
   */
  extern u64 of_translate_address(struct device_node *np, const u32 *addr);
 @@ -202,6 +202,10 @@
   */
  extern u64 of_translate_address(struct device_node *np, const u32 *addr);


@@ -70406,9 +69931,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/prom.h powerpc.
  /* Extract an address from a device, returns the region size and
   * the address space flags too. The PCI version uses a BAR number
   * instead of an absolute index
  /* Extract an address from a device, returns the region size and
   * the address space flags too. The PCI version uses a BAR number
   * instead of an absolute index

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ps3.h powerpc.git/include/asm-powerpc/ps3.h
---- linux-2.6.24/include/asm-powerpc/ps3.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/ps3.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/ps3.h
++++ b/include/asm-powerpc/ps3.h

 @@ -24,6 +24,7 @@
  #include <linux/init.h>
  #include <linux/types.h>
 @@ -24,6 +24,7 @@
  #include <linux/init.h>
  #include <linux/types.h>


@@ -70526,9 +70050,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ps3.h powerpc.g
 +u64 ps3_get_spe_id(void *arg);
  
  #endif
 +u64 ps3_get_spe_id(void *arg);
  
  #endif

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ptrace.h powerpc.git/include/asm-powerpc/ptrace.h
---- linux-2.6.24/include/asm-powerpc/ptrace.h  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/ptrace.h   2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/ptrace.h
++++ b/include/asm-powerpc/ptrace.h

 @@ -106,7 +106,8 @@
   */
  #define FULL_REGS(regs)               (((regs)->trap & 1) == 0)
 @@ -106,7 +106,8 @@
   */
  #define FULL_REGS(regs)               (((regs)->trap & 1) == 0)


@@ -70539,9 +70062,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/ptrace.h powerp
  #endif /* ! __powerpc64__ */
  #define TRAP(regs)            ((regs)->trap & ~0xF)
  #ifdef __powerpc64__
  #endif /* ! __powerpc64__ */
  #define TRAP(regs)            ((regs)->trap & ~0xF)
  #ifdef __powerpc64__

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/qe.h powerpc.git/include/asm-powerpc/qe.h
---- linux-2.6.24/include/asm-powerpc/qe.h      2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/qe.h       2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/qe.h
++++ b/include/asm-powerpc/qe.h

 @@ -28,6 +28,52 @@
  #define MEM_PART_SECONDARY    1
  #define MEM_PART_MURAM                2
 @@ -28,6 +28,52 @@
  #define MEM_PART_SECONDARY    1
  #define MEM_PART_MURAM                2


@@ -70733,9 +70255,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/qe.h powerpc.gi
  /* UPC */
  #define UPGCR_PROTOCOL        0x80000000      /* protocol ul2 or pl2 */
  #define UPGCR_TMS     0x40000000      /* Transmit master/slave mode */
  /* UPC */
  #define UPGCR_PROTOCOL        0x80000000      /* protocol ul2 or pl2 */
  #define UPGCR_TMS     0x40000000      /* Transmit master/slave mode */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/reg.h powerpc.git/include/asm-powerpc/reg.h
---- linux-2.6.24/include/asm-powerpc/reg.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/reg.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/reg.h
++++ b/include/asm-powerpc/reg.h

 @@ -553,6 +553,7 @@
  #define SPRN_PA6T_BTCR        978     /* Breakpoint and Tagging Control Register */
  #define SPRN_PA6T_IMAAT       979     /* Instruction Match Array Action Table */
 @@ -553,6 +553,7 @@
  #define SPRN_PA6T_BTCR        978     /* Breakpoint and Tagging Control Register */
  #define SPRN_PA6T_IMAAT       979     /* Instruction Match Array Action Table */


@@ -70757,9 +70278,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/reg.h powerpc.g
  /* Macros for setting and retrieving special purpose registers */
  #ifndef __ASSEMBLY__
  #define mfmsr()               ({unsigned long rval; \
  /* Macros for setting and retrieving special purpose registers */
  #ifndef __ASSEMBLY__
  #define mfmsr()               ({unsigned long rval; \

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/reg_booke.h powerpc.git/include/asm-powerpc/reg_booke.h
---- linux-2.6.24/include/asm-powerpc/reg_booke.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/reg_booke.h        2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/reg_booke.h
++++ b/include/asm-powerpc/reg_booke.h

 @@ -123,16 +123,23 @@
  #define SPRN_SPEFSCR  0x200   /* SPE & Embedded FP Status & Control */
  #define SPRN_BBEAR    0x201   /* Branch Buffer Entry Address Register */
 @@ -123,16 +123,23 @@
  #define SPRN_SPEFSCR  0x200   /* SPE & Embedded FP Status & Control */
  #define SPRN_BBEAR    0x201   /* Branch Buffer Entry Address Register */


@@ -70838,9 +70358,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/reg_booke.h pow
  #define ESR_PTR               0x02000000      /* Program Exception - Trap */
  #define ESR_FP                0x01000000      /* Floating Point Operation */
  #define ESR_DST               0x00800000      /* Storage Exception - Data miss */
  #define ESR_PTR               0x02000000      /* Program Exception - Trap */
  #define ESR_FP                0x01000000      /* Floating Point Operation */
  #define ESR_DST               0x00800000      /* Storage Exception - Data miss */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/setjmp.h powerpc.git/include/asm-powerpc/setjmp.h
---- linux-2.6.24/include/asm-powerpc/setjmp.h  1970-01-01 01:00:00.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/setjmp.h   2008-01-28 20:26:42.000000000 +0100
+--- /dev/null
++++ b/include/asm-powerpc/setjmp.h

 @@ -0,0 +1,18 @@
 +/*
 + * Copyright © 2008 Michael Neuling IBM Corporation
 @@ -0,0 +1,18 @@
 +/*
 + * Copyright © 2008 Michael Neuling IBM Corporation


@@ -70860,9 +70379,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/setjmp.h powerp
 +extern void longjmp(long *, long);
 +
 +#endif /* _ASM_POWERPC_SETJMP_H */
 +extern void longjmp(long *, long);
 +
 +#endif /* _ASM_POWERPC_SETJMP_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/smu.h powerpc.git/include/asm-powerpc/smu.h
---- linux-2.6.24/include/asm-powerpc/smu.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/smu.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/smu.h
++++ b/include/asm-powerpc/smu.h

 @@ -22,7 +22,7 @@
   * Partition info commands
   *
 @@ -22,7 +22,7 @@
   * Partition info commands
   *


@@ -71063,9 +70581,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/smu.h powerpc.g
  };
  
  #endif /*  _SMU_H */
  };
  
  #endif /*  _SMU_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/sparsemem.h powerpc.git/include/asm-powerpc/sparsemem.h
---- linux-2.6.24/include/asm-powerpc/sparsemem.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/sparsemem.h        2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/sparsemem.h
++++ b/include/asm-powerpc/sparsemem.h

 @@ -10,13 +10,8 @@
   */
  #define SECTION_SIZE_BITS       24
 @@ -10,13 +10,8 @@
   */
  #define SECTION_SIZE_BITS       24


@@ -71080,9 +70597,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/sparsemem.h pow
  
  #ifdef CONFIG_MEMORY_HOTPLUG
  extern void create_section_mapping(unsigned long start, unsigned long end);
  
  #ifdef CONFIG_MEMORY_HOTPLUG
  extern void create_section_mapping(unsigned long start, unsigned long end);

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu.h powerpc.git/include/asm-powerpc/spu.h
---- linux-2.6.24/include/asm-powerpc/spu.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/spu.h      2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/spu.h
++++ b/include/asm-powerpc/spu.h

 @@ -104,6 +104,7 @@
  
  struct spu_context;
 @@ -104,6 +104,7 @@
  
  struct spu_context;


@@ -71164,9 +70680,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu.h powerpc.g
        u8  pad_0x158_0x180[0x28];                              /* 0x158 */
        u64 int_route_RW;                                       /* 0x180 */
  
        u8  pad_0x158_0x180[0x28];                              /* 0x158 */
        u64 int_route_RW;                                       /* 0x180 */
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_csa.h powerpc.git/include/asm-powerpc/spu_csa.h
---- linux-2.6.24/include/asm-powerpc/spu_csa.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/spu_csa.h  2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/spu_csa.h
++++ b/include/asm-powerpc/spu_csa.h

 @@ -194,7 +194,7 @@
  };
  
 @@ -194,7 +194,7 @@
  };
  


@@ -71198,9 +70713,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_csa.h power
  #endif /* !__SPU__ */
  #endif /* __KERNEL__ */
  #endif /* !__ASSEMBLY__ */
  #endif /* !__SPU__ */
  #endif /* __KERNEL__ */
  #endif /* !__ASSEMBLY__ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_priv1.h powerpc.git/include/asm-powerpc/spu_priv1.h
---- linux-2.6.24/include/asm-powerpc/spu_priv1.h       2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/spu_priv1.h        2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/spu_priv1.h
++++ b/include/asm-powerpc/spu_priv1.h

 @@ -24,6 +24,7 @@
  #include <linux/types.h>
  
 @@ -24,6 +24,7 @@
  #include <linux/types.h>
  


@@ -71237,9 +70751,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/spu_priv1.h pow
  /*
   * The declarations folowing are put here for convenience
   * and only intended to be used by the platform setup code.
  /*
   * The declarations folowing are put here for convenience
   * and only intended to be used by the platform setup code.

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/system.h powerpc.git/include/asm-powerpc/system.h
---- linux-2.6.24/include/asm-powerpc/system.h  2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/system.h   2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/system.h
++++ b/include/asm-powerpc/system.h

 @@ -169,6 +169,8 @@
  extern void bad_page_fault(struct pt_regs *, unsigned long, int);
  extern int die(const char *, struct pt_regs *, long);
 @@ -169,6 +169,8 @@
  extern void bad_page_fault(struct pt_regs *, unsigned long, int);
  extern int die(const char *, struct pt_regs *, long);


@@ -71249,9 +70762,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/system.h powerp
  #ifdef CONFIG_BOOKE_WDT
  extern u32 booke_wdt_enabled;
  extern u32 booke_wdt_period;
  #ifdef CONFIG_BOOKE_WDT
  extern u32 booke_wdt_enabled;
  extern u32 booke_wdt_period;

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/udbg.h powerpc.git/include/asm-powerpc/udbg.h
---- linux-2.6.24/include/asm-powerpc/udbg.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-powerpc/udbg.h     2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-powerpc/udbg.h
++++ b/include/asm-powerpc/udbg.h

 @@ -48,6 +48,7 @@
  extern void __init udbg_init_debug_beat(void);
  extern void __init udbg_init_btext(void);
 @@ -48,6 +48,7 @@
  extern void __init udbg_init_debug_beat(void);
  extern void __init udbg_init_btext(void);


@@ -71260,9 +70772,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-powerpc/udbg.h powerpc.
  extern void __init udbg_init_cpm(void);
  
  #endif /* __KERNEL__ */
  extern void __init udbg_init_cpm(void);
  
  #endif /* __KERNEL__ */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/8xx_immap.h powerpc.git/include/asm-ppc/8xx_immap.h
---- linux-2.6.24/include/asm-ppc/8xx_immap.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-ppc/8xx_immap.h    2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-ppc/8xx_immap.h
++++ b/include/asm-ppc/8xx_immap.h

 @@ -123,7 +123,7 @@
  #define OR_G5LA               0x00000400      /* Output #GPL5 on #GPL_A5              */
  #define OR_G5LS               0x00000200      /* Drive #GPL high on falling edge of...*/
 @@ -123,7 +123,7 @@
  #define OR_G5LA               0x00000400      /* Output #GPL5 on #GPL_A5              */
  #define OR_G5LS               0x00000200      /* Drive #GPL high on falling edge of...*/


@@ -71272,9 +70783,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/8xx_immap.h powerpc
  #define OR_SCY_0_CLK  0x00000000      /* 0 clock cycles wait states           */
  #define OR_SCY_1_CLK  0x00000010      /* 1 clock cycles wait states           */
  #define OR_SCY_2_CLK  0x00000020      /* 2 clock cycles wait states           */
  #define OR_SCY_0_CLK  0x00000000      /* 0 clock cycles wait states           */
  #define OR_SCY_1_CLK  0x00000010      /* 1 clock cycles wait states           */
  #define OR_SCY_2_CLK  0x00000020      /* 2 clock cycles wait states           */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/commproc.h powerpc.git/include/asm-ppc/commproc.h
---- linux-2.6.24/include/asm-ppc/commproc.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-ppc/commproc.h     2008-01-28 20:26:42.000000000 +0100
+--- a/include/asm-ppc/commproc.h
++++ b/include/asm-ppc/commproc.h

 @@ -681,7 +681,7 @@
  #define       CICR_SCC_SCC3           ((uint)0x00200000)      /* SCC3 @ SCCc */
  #define       CICR_SCB_SCC2           ((uint)0x00040000)      /* SCC2 @ SCCb */
 @@ -681,7 +681,7 @@
  #define       CICR_SCC_SCC3           ((uint)0x00200000)      /* SCC3 @ SCCc */
  #define       CICR_SCB_SCC2           ((uint)0x00040000)      /* SCC2 @ SCCb */


@@ -71284,9 +70794,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/commproc.h powerpc.
  #define CICR_HP_MASK          ((uint)0x00001f00)      /* Hi-pri int. */
  #define CICR_IEN              ((uint)0x00000080)      /* Int. enable */
  #define CICR_SPS              ((uint)0x00000001)      /* SCC Spread */
  #define CICR_HP_MASK          ((uint)0x00001f00)      /* Hi-pri int. */
  #define CICR_IEN              ((uint)0x00000080)      /* Int. enable */
  #define CICR_SPS              ((uint)0x00000001)      /* SCC Spread */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/mmu.h powerpc.git/include/asm-ppc/mmu.h
---- linux-2.6.24/include/asm-ppc/mmu.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-ppc/mmu.h  2008-01-28 20:26:43.000000000 +0100
+--- a/include/asm-ppc/mmu.h
++++ b/include/asm-ppc/mmu.h

 @@ -383,6 +383,12 @@
  #define BOOKE_PAGESZ_256GB    14
  #define BOOKE_PAGESZ_1TB      15
 @@ -383,6 +383,12 @@
  #define BOOKE_PAGESZ_256GB    14
  #define BOOKE_PAGESZ_1TB      15


@@ -71300,9 +70809,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/mmu.h powerpc.git/i
  /*
   * Freescale Book-E MMU support
   */
  /*
   * Freescale Book-E MMU support
   */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/mpc52xx_psc.h powerpc.git/include/asm-ppc/mpc52xx_psc.h
---- linux-2.6.24/include/asm-ppc/mpc52xx_psc.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-ppc/mpc52xx_psc.h  2008-01-28 20:26:43.000000000 +0100
+--- a/include/asm-ppc/mpc52xx_psc.h
++++ b/include/asm-ppc/mpc52xx_psc.h

 @@ -159,6 +159,9 @@
        u8              reserved16[3];
        u8              irfdr;          /* PSC + 0x54 */
 @@ -159,6 +159,9 @@
        u8              reserved16[3];
        u8              irfdr;          /* PSC + 0x54 */


@@ -71313,9 +70821,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/mpc52xx_psc.h power
        u16             rfnum;          /* PSC + 0x58 */
        u16             reserved18;
        u16             tfnum;          /* PSC + 0x5c */
        u16             rfnum;          /* PSC + 0x58 */
        u16             reserved18;
        u16             tfnum;          /* PSC + 0x5c */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/reg_booke.h powerpc.git/include/asm-ppc/reg_booke.h
---- linux-2.6.24/include/asm-ppc/reg_booke.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/asm-ppc/reg_booke.h    2008-01-28 20:26:43.000000000 +0100
+--- a/include/asm-ppc/reg_booke.h
++++ b/include/asm-ppc/reg_booke.h

 @@ -207,7 +207,7 @@
  #define       CCR1_TCS        0x00000080 /* Timer Clock Select */
  
 @@ -207,7 +207,7 @@
  #define       CCR1_TCS        0x00000080 /* Timer Clock Select */
  


@@ -71334,9 +70841,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/asm-ppc/reg_booke.h powerpc
  #define ESR_PTR               0x02000000      /* Program Exception - Trap */
  #define ESR_FP                0x01000000      /* Floating Point Operation */
  #define ESR_DST               0x00800000      /* Storage Exception - Data miss */
  #define ESR_PTR               0x02000000      /* Program Exception - Trap */
  #define ESR_FP                0x01000000      /* Floating Point Operation */
  #define ESR_DST               0x00800000      /* Storage Exception - Data miss */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/of.h powerpc.git/include/linux/of.h
---- linux-2.6.24/include/linux/of.h    2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/linux/of.h     2008-01-28 20:26:44.000000000 +0100
+--- a/include/linux/of.h
++++ b/include/linux/of.h

 @@ -17,6 +17,7 @@
   */
  #include <linux/types.h>
 @@ -17,6 +17,7 @@
   */
  #include <linux/types.h>


@@ -71374,9 +70880,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/of.h powerpc.git/incl
 +      const struct of_device_id *matches, const struct device_node *node);
  
  #endif /* _LINUX_OF_H */
 +      const struct of_device_id *matches, const struct device_node *node);
  
  #endif /* _LINUX_OF_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/of_device.h powerpc.git/include/linux/of_device.h
---- linux-2.6.24/include/linux/of_device.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/linux/of_device.h      2008-01-28 20:26:44.000000000 +0100
+--- a/include/linux/of_device.h
++++ b/include/linux/of_device.h

 @@ -10,8 +10,6 @@
  
  #define       to_of_device(d) container_of(d, struct of_device, dev)
 @@ -10,8 +10,6 @@
  
  #define       to_of_device(d) container_of(d, struct of_device, dev)


@@ -71386,9 +70891,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/of_device.h powerpc.g
  extern const struct of_device_id *of_match_device(
        const struct of_device_id *matches, const struct of_device *dev);
  
  extern const struct of_device_id *of_match_device(
        const struct of_device_id *matches, const struct of_device *dev);
  

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/pata_platform.h powerpc.git/include/linux/pata_platform.h
---- linux-2.6.24/include/linux/pata_platform.h 2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/linux/pata_platform.h  2008-01-28 20:26:44.000000000 +0100
+--- a/include/linux/pata_platform.h
++++ b/include/linux/pata_platform.h

 @@ -15,4 +15,13 @@
        unsigned int irq_flags;
  };
 @@ -15,4 +15,13 @@
        unsigned int irq_flags;
  };


@@ -71403,9 +70907,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/pata_platform.h power
 +extern int __devexit __pata_platform_remove(struct device *dev);
 +
  #endif /* __LINUX_PATA_PLATFORM_H */
 +extern int __devexit __pata_platform_remove(struct device *dev);
 +
  #endif /* __LINUX_PATA_PLATFORM_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/phy_fixed.h powerpc.git/include/linux/phy_fixed.h
---- linux-2.6.24/include/linux/phy_fixed.h     2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/linux/phy_fixed.h      2008-01-28 20:26:44.000000000 +0100
+--- a/include/linux/phy_fixed.h
++++ b/include/linux/phy_fixed.h

 @@ -1,38 +1,31 @@
  #ifndef __PHY_FIXED_H
  #define __PHY_FIXED_H
 @@ -1,38 +1,31 @@
  #ifndef __PHY_FIXED_H
  #define __PHY_FIXED_H


@@ -71467,9 +70970,8 @@ diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/phy_fixed.h powerpc.g
 +                                         struct fixed_phy_status *));
  
  #endif /* __PHY_FIXED_H */
 +                                         struct fixed_phy_status *));
  
  #endif /* __PHY_FIXED_H */

-diff -x .git -x .gitignore -Nur linux-2.6.24/include/linux/pmu.h powerpc.git/include/linux/pmu.h
---- linux-2.6.24/include/linux/pmu.h   2008-01-24 23:58:37.000000000 +0100
-+++ powerpc.git/include/linux/pmu.h    2008-01-28 20:26:44.000000000 +0100
+--- a/include/linux/pmu.h
++++ b/include/linux/pmu.h

 @@ -159,41 +159,7 @@
  extern int pmu_present(void);
  extern int pmu_get_model(void);
 @@ -159,41 +159,7 @@
  extern int pmu_present(void);
  extern int pmu_get_model(void);