summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-01-13 20:54:50 +0100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-01-16 06:15:11 +0100
commitc52fe6b620e9c7a52b296ec478bd24b91b4e7634 (patch)
tree3c829ad29fb58aba2786394d840c0dc66a9e553b /arch
parentpowerpc: Cleanup from l64 to ll64 change drivers/scsi (diff)
downloadlinux-c52fe6b620e9c7a52b296ec478bd24b91b4e7634.tar.xz
linux-c52fe6b620e9c7a52b296ec478bd24b91b4e7634.zip
powerpc/ps3: set_dabr() takes an unsigned long
Also silences this warning: arch/powerpc/platforms/ps3/setup.c:275: warning: initialization from incompatible pointer type Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Acked-by: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/ps3/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 35f3e85cf60e..3331ccbb8d38 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -186,7 +186,7 @@ early_param("ps3flash", early_parse_ps3flash);
#define prealloc_ps3flash_bounce_buffer() do { } while (0)
#endif
-static int ps3_set_dabr(u64 dabr)
+static int ps3_set_dabr(unsigned long dabr)
{
enum {DABR_USER = 1, DABR_KERNEL = 2,};