diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-20 13:39:12 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-20 13:39:12 -0400 |
| commit | 823dcd2506fa369aeb8cbd26da5663efe2fda9a9 (patch) | |
| tree | 853b3e3c05f0b9ee1b5df8464db19b7acc57150c /drivers/net/ethernet/amd | |
| parent | eaa36660de7e174498618d69d7277d44a2f24c3d (diff) | |
| parent | 98e77438aed3cd3343cbb86825127b1d9d2bea33 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/amd')
| -rw-r--r-- | drivers/net/ethernet/amd/pcnet32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c index e19c1a73c955..c90fe917090b 100644 --- a/drivers/net/ethernet/amd/pcnet32.c +++ b/drivers/net/ethernet/amd/pcnet32.c | |||
| @@ -82,7 +82,7 @@ static int cards_found; | |||
| 82 | /* | 82 | /* |
| 83 | * VLB I/O addresses | 83 | * VLB I/O addresses |
| 84 | */ | 84 | */ |
| 85 | static unsigned int pcnet32_portlist[] __initdata = | 85 | static unsigned int pcnet32_portlist[] = |
| 86 | { 0x300, 0x320, 0x340, 0x360, 0 }; | 86 | { 0x300, 0x320, 0x340, 0x360, 0 }; |
| 87 | 87 | ||
| 88 | static int pcnet32_debug; | 88 | static int pcnet32_debug; |