diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/mtd/devices/slram.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/mtd/devices/slram.c')
| -rw-r--r-- | drivers/mtd/devices/slram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c index 3aa05cd18ea1..592016a0668f 100644 --- a/drivers/mtd/devices/slram.c +++ b/drivers/mtd/devices/slram.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | to specify the offset instead of the absolute address | 18 | to specify the offset instead of the absolute address |
| 19 | 19 | ||
| 20 | NOTE: | 20 | NOTE: |
| 21 | With slram it's only possible to map a contigous memory region. Therfore | 21 | With slram it's only possible to map a contiguous memory region. Therefore |
| 22 | if there's a device mapped somewhere in the region specified slram will | 22 | if there's a device mapped somewhere in the region specified slram will |
| 23 | fail to load (see kernel log if modprobe fails). | 23 | fail to load (see kernel log if modprobe fails). |
| 24 | 24 | ||