sparc: merge of_platform_{32,64}.h
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Jul 2008 06:54:33 +0000 (23:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Jul 2008 06:54:33 +0000 (23:54 -0700)
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/include/asm/of_platform.h
arch/sparc/include/asm/of_platform_32.h [deleted file]
arch/sparc/include/asm/of_platform_64.h [deleted file]

Simple merge
diff --cc arch/sparc/include/asm/of_platform_32.h
Simple merge
diff --cc arch/sparc/include/asm/of_platform_64.h
Simple merge