Merge master.kernel.org:/home/rmk/linux-2.6-arm

[karo-tx-linux.git] / drivers / ieee1394 / csr1212.h

diff --git a/drivers/ieee1394/csr1212.h b/drivers/ieee1394/csr1212.h
index aced168f1be28e97b6615275535eeb747bfabcd5..a892d922dbc9ed05240db633a3eff794b604b53a 100644 (file)
--- a/drivers/ieee1394/csr1212.h
+++ b/drivers/ieee1394/csr1212.h
@@ -181,7 +181,7 @@ struct csr1212_csr_rom_cache {
 struct csr1212_csr {
        size_t bus_info_len;    /* bus info block length in bytes */
        size_t crc_len;         /* crc length in bytes */
-       u32 *bus_info_data;     /* bus info data incl bus name and EUI */
+       __be32 *bus_info_data;  /* bus info data incl bus name and EUI */
 
        void *private;          /* private, bus specific data */
        struct csr1212_bus_ops *ops;