diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/3c523.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/3c523.c')
| -rw-r--r-- | drivers/net/3c523.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c index de579d04316..bc0d1a1c2e2 100644 --- a/drivers/net/3c523.c +++ b/drivers/net/3c523.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | this for the 64K version would require a lot of heinous bank | 44 | this for the 64K version would require a lot of heinous bank |
| 45 | switching, which I'm sure not interested in doing. If you try to | 45 | switching, which I'm sure not interested in doing. If you try to |
| 46 | implement a bank switching version, you'll basically have to remember | 46 | implement a bank switching version, you'll basically have to remember |
| 47 | what bank is enabled and do a switch everytime you access a memory | 47 | what bank is enabled and do a switch every time you access a memory |
| 48 | location that's not current. You'll also have to remap pointers on | 48 | location that's not current. You'll also have to remap pointers on |
| 49 | the driver side, because it only knows about 16K of the memory. | 49 | the driver side, because it only knows about 16K of the memory. |
| 50 | Anyone desperate or masochistic enough to try? | 50 | Anyone desperate or masochistic enough to try? |