[git pull] Please pull powerpc.git merge branch

Linus,

Please pull from the 'merge' branch of

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge

The main thing there is that we have moved the powerpc include files
from include/asm-powerpc to arch/powerpc/include/asm.  There is also a
commit from Kumar Gala that removes code that was only referenced when
compiling with ARCH=ppc, and is now dead since arch/ppc is gone, plus
a couple of warning fixes from Tony Breeds.

(Note that the stuff in arch/powerpc/include/asm/irq.h all came from
include/asm-powerpc/irq.h; there was enough stuff removed by Kumar's
patch that the git rename detection logic didn't see it as a rename.)

Thanks,
Paul.

 Documentation/powerpc/booting-without-of.txt       |    4 +-
 Documentation/powerpc/eeh-pci-error-recovery.txt   |    2 +-
 arch/powerpc/Kconfig.debug                         |    2 +-
 arch/powerpc/boot/io.h                             |    2 +-
 .../powerpc/include/asm}/8253pit.h                 |    0 
 .../powerpc/include/asm}/8xx_immap.h               |    0 
 .../powerpc/include/asm}/Kbuild                    |    0 
 .../powerpc/include/asm}/a.out.h                   |    0 
 .../powerpc/include/asm}/abs_addr.h                |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/agp.h |    0 
 .../powerpc/include/asm}/asm-compat.h              |    0 
 .../powerpc/include/asm}/atomic.h                  |    0 
 .../powerpc/include/asm}/auxvec.h                  |    0 
 .../powerpc/include/asm}/backlight.h               |    0 
 .../powerpc/include/asm}/bitops.h                  |    0 
 .../powerpc/include/asm}/bootx.h                   |    0 
 .../powerpc/include/asm}/btext.h                   |    0 
 .../asm-powerpc => arch/powerpc/include/asm}/bug.h |    0 
 .../powerpc/include/asm}/bugs.h                    |    0 
 .../powerpc/include/asm}/byteorder.h               |    0 
 .../powerpc/include/asm}/cache.h                   |    0 

535 more lines

On Mon, 4 Aug 2008 14:49:16 +1000
"Paul Mackerras" [off-list ref] wrote:

Linus,

Please pull from the 'merge' branch of

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git merge

The main thing there is that we have moved the powerpc include files
from include/asm-powerpc to arch/powerpc/include/asm.  There is also a
commit from Kumar Gala that removes code that was only referenced when
compiling with ARCH=ppc, and is now dead since arch/ppc is gone, plus
a couple of warning fixes from Tony Breeds.

What is the "correct" way to include these files? I have a driver
that needs to access get_tbl() which is defined in time.h.

Do I put:

#include <arch/powerpc/include/asm/time.h>

in the source file?

Cheers,
   Sean

False alarm. They hardcoded the arch into the include. So

#include <asm-powerpc/time.h>

no longer works but

#include <asm/time.h>

does. This is an artifact from when we where trying to use arch/ppc.

Cheers,
   Sean