diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/scsi/esp_scsi.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/scsi/esp_scsi.c')
| -rw-r--r-- | drivers/scsi/esp_scsi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c index 99ce03331b64..ec71061aef61 100644 --- a/drivers/scsi/esp_scsi.c +++ b/drivers/scsi/esp_scsi.c | |||
| @@ -2212,7 +2212,7 @@ static void __devinit esp_init_swstate(struct esp *esp) | |||
| 2212 | } | 2212 | } |
| 2213 | 2213 | ||
| 2214 | /* This places the ESP into a known state at boot time. */ | 2214 | /* This places the ESP into a known state at boot time. */ |
| 2215 | static void __devinit esp_bootup_reset(struct esp *esp) | 2215 | static void esp_bootup_reset(struct esp *esp) |
| 2216 | { | 2216 | { |
| 2217 | u8 val; | 2217 | u8 val; |
| 2218 | 2218 | ||