projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
sections: fix section conflicts in drivers/net
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ethernet
/
qlogic
/
qlcnic
/
qlcnic_hw.c
diff --git
a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
index
b528e52
..
2a0c9dc
100644
(file)
--- a/
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
+++ b/
drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c
@@
-38,7
+38,7
@@
static inline void writeq(u64 val, void __iomem *addr)
}
#endif
-static
const
struct crb_128M_2M_block_map
+static struct crb_128M_2M_block_map
crb_128M_2M_map[64] __cacheline_aligned_in_smp = {
{{{0, 0, 0, 0} } }, /* 0: PCI */
{{{1, 0x0100000, 0x0102000, 0x120000}, /* 1: PCIE */