diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/3c523.c | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.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 de579d043169..bc0d1a1c2e28 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? |