linux-next: manual merge of the tip-core tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip-core tree got a conflict in
arch/powerpc/include/asm/types.h between commit
b9579689ad3a208c342aed806afc7a9a808c4e1e ("powerpc: Make dma_addr_t a u64
if CONFIG_PHYS_64BIT is set") from the powerpc tree and commit
600715dcdf567c86f8b2c6173fcfb4b873e25a19 ("generic: add phys_addr_t for
holding physical addresses") from the tip-core tree.

Just a context clash.  I fixed it up (see below) and can carry the fix.

-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc arch/powerpc/include/asm/types.h
index a9a9262,c646f34..0000000
--- a/arch/powerpc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
@@@ -48,14 -48,7 +48,7 @@@ typedef struct 
  
  typedef __vector128 vector128;
  
- /* Physical address used by some IO functions */
- #if defined(CONFIG_PPC64) || defined(CONFIG_PHYS_64BIT)
- typedef u64 phys_addr_t;
- #else
- typedef u32 phys_addr_t;
- #endif
- 
 -#ifdef __powerpc64__
 +#if defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)
  typedef u64 dma_addr_t;
  #else
  typedef u32 dma_addr_t;

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20081014/6a36e3da/attachment.pgp>