summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorEugene Surovegin <ebs@ebshome.net>2005-09-04 00:55:45 +0200
committerLinus Torvalds <torvalds@evo.osdl.org>2005-09-05 09:05:58 +0200
commitcc506644202d23bcf115999ee911a53f177ce682 (patch)
treee08a245cd3916a0012a776241c63c8e5aad2ffed /arch
parent[PATCH] ppc32: fix EMAC Tx channel assignments for NPe405H (diff)
downloadlinux-cc506644202d23bcf115999ee911a53f177ce682.tar.xz
linux-cc506644202d23bcf115999ee911a53f177ce682.zip
[PATCH] ppc32: fix Bamboo and Luan build warnings
Fix STD_UART_OP definitions in Bamboo and Luan board ports which were causing "initialization makes pointer from integer without a cast" warnings. Signed-off-by: Eugene Surovegin <ebs@ebshome.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc/platforms/4xx/bamboo.h2
-rw-r--r--arch/ppc/platforms/4xx/luan.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/platforms/4xx/bamboo.h b/arch/ppc/platforms/4xx/bamboo.h
index 63d714504148..5c0192826494 100644
--- a/arch/ppc/platforms/4xx/bamboo.h
+++ b/arch/ppc/platforms/4xx/bamboo.h
@@ -88,7 +88,7 @@
#define STD_UART_OP(num) \
{ 0, BASE_BAUD, 0, UART##num##_INT, \
(ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \
- iomem_base: UART##num##_IO_BASE, \
+ iomem_base: (void*)UART##num##_IO_BASE, \
io_type: SERIAL_IO_MEM},
#define SERIAL_PORT_DFNS \
diff --git a/arch/ppc/platforms/4xx/luan.h b/arch/ppc/platforms/4xx/luan.h
index 09b444c87816..bbe7d0766db8 100644
--- a/arch/ppc/platforms/4xx/luan.h
+++ b/arch/ppc/platforms/4xx/luan.h
@@ -55,7 +55,7 @@
#define STD_UART_OP(num) \
{ 0, BASE_BAUD, 0, UART##num##_INT, \
(ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST), \
- iomem_base: UART##num##_IO_BASE, \
+ iomem_base: (void*)UART##num##_IO_BASE, \
io_type: SERIAL_IO_MEM},
#define SERIAL_PORT_DFNS \