diff options
| author | NeilBrown <neilb@suse.de> | 2010-05-22 08:31:36 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-05-22 08:31:36 +1000 |
| commit | 19fdb9eefb21b72edbc365b838502780c392bad6 (patch) | |
| tree | deae04c48532d6eab64ed4b0396737bb854b5506 /drivers/char/ip2/i2hw.h | |
| parent | be6800a73aa2f3dc14744c3b80e676d189789f04 (diff) | |
| parent | 3ff195b011d7decf501a4d55aeed312731094796 (diff) | |
Merge commit '3ff195b011d7decf501a4d55aeed312731094796' into for-linus
Conflicts:
drivers/md/md.c
- Resolved conflict in md_update_sb
- Added extra 'NULL' arg to new instance of sysfs_get_dirent.
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'drivers/char/ip2/i2hw.h')
| -rw-r--r-- | drivers/char/ip2/i2hw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ip2/i2hw.h b/drivers/char/ip2/i2hw.h index 8aa6e7ab8d5..c0ba6c05f0c 100644 --- a/drivers/char/ip2/i2hw.h +++ b/drivers/char/ip2/i2hw.h @@ -559,7 +559,7 @@ Loadware may be sent to the board in two ways: 2) It may be hard-coded into your source by including a .h file (typically supplied by Computone), which declares a data array and initializes every - element. This acheives the same result as if an entire loadware file had + element. This achieves the same result as if an entire loadware file had been read into the array. This requires more data space in your program, but access to the file system |