diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 20:35:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 20:35:42 -0400 |
| commit | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (patch) | |
| tree | 53d311c909a3f333d48ab70d93e8a9010056d498 /drivers/scsi/esp_scsi.c | |
| parent | d12db0b08f6c14dfd1438f6f6ad49dcd663c9ae5 (diff) | |
| parent | d679f805e7d16291f7671710dd42522561a46611 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SCSI] esp_scsi: Fix section mismatch warnings.
[VIDEO] sunxvr2500: Fix PCI device ID table.
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 | ||