aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/hpilo.h
diff options
context:
space:
mode:
authorPrarit Bhargava <prarit@redhat.com>2010-08-09 17:20:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 20:45:05 -0700
commitcdf8afca2417c5ae2a940a2ff2d36af986a3cf1d (patch)
tree872d838052885087b633b2e40778c6a26606332b /drivers/misc/hpilo.h
parent7efe15f2a4cd9d40826d31d7d5ef56094f8b65f5 (diff)
downloadkernel_samsung_aries-cdf8afca2417c5ae2a940a2ff2d36af986a3cf1d.zip
kernel_samsung_aries-cdf8afca2417c5ae2a940a2ff2d36af986a3cf1d.tar.gz
kernel_samsung_aries-cdf8afca2417c5ae2a940a2ff2d36af986a3cf1d.tar.bz2
hpilo: fix pointer warning in ilo_ccb_setup
Fix i386 PAE compile warning: drivers/misc/hpilo.c: In function `ilo_ccb_setup': drivers/misc/hpilo.c:274: warning: cast to pointer from integer of different size dma_addr_t is 64 on i386 PAE which causes a size mismatch. Signed-off-by: Prarit Bhargava <prarit@redhat.com> Acked-by: David Altobelli <david.altobelli@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/hpilo.h')
-rw-r--r--drivers/misc/hpilo.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/misc/hpilo.h b/drivers/misc/hpilo.h
index 247eb38..54e43ad 100644
--- a/drivers/misc/hpilo.h
+++ b/drivers/misc/hpilo.h
@@ -79,21 +79,21 @@ struct ilo_hwinfo {
struct ccb {
union {
char *send_fifobar;
- u64 padding1;
+ u64 send_fifobar_pa;
} ccb_u1;
union {
char *send_desc;
- u64 padding2;
+ u64 send_desc_pa;
} ccb_u2;
u64 send_ctrl;
union {
char *recv_fifobar;
- u64 padding3;
+ u64 recv_fifobar_pa;
} ccb_u3;
union {
char *recv_desc;
- u64 padding4;
+ u64 recv_desc_pa;
} ccb_u4;
u64 recv_ctrl;