diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /arch/sh/boards/landisk/gio.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'arch/sh/boards/landisk/gio.c')
| -rw-r--r-- | arch/sh/boards/landisk/gio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/landisk/gio.c b/arch/sh/boards/landisk/gio.c index 50d38be62f01..a37643d002b2 100644 --- a/arch/sh/boards/landisk/gio.c +++ b/arch/sh/boards/landisk/gio.c | |||
| @@ -69,7 +69,7 @@ static int gio_ioctl(struct inode *inode, struct file *filp, | |||
| 69 | } | 69 | } |
| 70 | 70 | ||
| 71 | switch (cmd) { | 71 | switch (cmd) { |
| 72 | case GIODRV_IOCSGIOSETADDR: /* addres set */ | 72 | case GIODRV_IOCSGIOSETADDR: /* address set */ |
| 73 | addr = data; | 73 | addr = data; |
| 74 | break; | 74 | break; |
| 75 | 75 | ||