Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / ieee1394 / pcilynx.h

diff --git a/drivers/ieee1394/pcilynx.h b/drivers/ieee1394/pcilynx.h
index ec27321f6724e507ec2a79febf03025d6dec1fe5..693a169acea3fe0c831198044167101c2bcd4064 100644 (file)
--- 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