summaryrefslogtreecommitdiff
path: root/drivers/ieee1394/pcilynx.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 05:43:52 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-11 05:43:52 +0300
commit99cd7074891f87c49660e3b2880564324a4733ac (patch)
tree903d2665bcb445f1f265d1adf7a99f265bcefc15 /drivers/ieee1394/pcilynx.h
parente8a9cbf6ae620d9e5ba9cb42001c033287a284a3 (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadlinux-99cd7074891f87c49660e3b2880564324a4733ac.tar.xz
Merge commit 'v2.6.29-rc1' into tracing/urgent
Diffstat (limited to 'drivers/ieee1394/pcilynx.h')
-rw-r--r--drivers/ieee1394/pcilynx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ieee1394/pcilynx.h b/drivers/ieee1394/pcilynx.h
index ec27321f6724..693a169acea3 100644
--- a/drivers/ieee1394/pcilynx.h
+++ b/drivers/ieee1394/pcilynx.h
@@ -52,7 +52,7 @@ struct ti_lynx {
void __iomem *local_rom;
void __iomem *local_ram;
void __iomem *aux_port;
- quadlet_t bus_info_block[5];
+ __be32 bus_info_block[5];
/*
* use local RAM of LOCALRAM_SIZE bytes for PCLs, which allows for