aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64/openprom.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 08:43:13 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 08:43:13 -0700
commitc4a7c77fcb8c0ef16e7193fb8cab2654282bbfab (patch)
treeca3a211950c7511609ba3f01ec11831d90882f22 /include/asm-sparc64/openprom.h
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parent[RADEON]: Fix unaligned I/O port access during probe. (diff)
downloadlinux-dev-c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab.tar.xz
linux-dev-c4a7c77fcb8c0ef16e7193fb8cab2654282bbfab.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to '')
-rw-r--r--include/asm-sparc64/openprom.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/openprom.h b/include/asm-sparc64/openprom.h
index 0a336901d585..b4959d2b0d99 100644
--- a/include/asm-sparc64/openprom.h
+++ b/include/asm-sparc64/openprom.h
@@ -186,8 +186,8 @@ struct linux_prom_registers {
};
struct linux_prom64_registers {
- long phys_addr;
- long reg_size;
+ unsigned long phys_addr;
+ unsigned long reg_size;
};
struct linux_prom_irqs {