diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/eexpress.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/eexpress.c')
| -rw-r--r-- | drivers/net/eexpress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 12c37d264108..48ee51bb9e50 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
| @@ -1103,7 +1103,7 @@ static int __init eexp_hw_probe(struct net_device *dev, unsigned short ioaddr) | |||
| 1103 | dev->dev_addr[i] = ((unsigned char *)hw_addr)[5-i]; | 1103 | dev->dev_addr[i] = ((unsigned char *)hw_addr)[5-i]; |
| 1104 | 1104 | ||
| 1105 | { | 1105 | { |
| 1106 | static char irqmap[]={0, 9, 3, 4, 5, 10, 11, 0}; | 1106 | static const char irqmap[] = { 0, 9, 3, 4, 5, 10, 11, 0 }; |
| 1107 | unsigned short setupval = eexp_hw_readeeprom(ioaddr,0); | 1107 | unsigned short setupval = eexp_hw_readeeprom(ioaddr,0); |
| 1108 | 1108 | ||
| 1109 | /* Use the IRQ from EEPROM if none was given */ | 1109 | /* Use the IRQ from EEPROM if none was given */ |