diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/ieee1394/pcilynx.h | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ieee1394/pcilynx.h')
| -rw-r--r-- | drivers/ieee1394/pcilynx.h | 2 |
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 { | |||
| 52 | void __iomem *local_rom; | 52 | void __iomem *local_rom; |
| 53 | void __iomem *local_ram; | 53 | void __iomem *local_ram; |
| 54 | void __iomem *aux_port; | 54 | void __iomem *aux_port; |
| 55 | quadlet_t bus_info_block[5]; | 55 | __be32 bus_info_block[5]; |
| 56 | 56 | ||
| 57 | /* | 57 | /* |
| 58 | * use local RAM of LOCALRAM_SIZE bytes for PCLs, which allows for | 58 | * use local RAM of LOCALRAM_SIZE bytes for PCLs, which allows for |