diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 14:27:42 +0200 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 14:27:42 +0200 |
| commit | cf57a308436653f3094590202c77459aab250ff3 (patch) | |
| tree | 8a9e7096e494141911147a1f24865c3d79d583c1 /drivers/scsi/qla1280.c | |
| parent | [GFS2] Fix locking for Direct I/O reads (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq (diff) | |
| download | linux-cf57a308436653f3094590202c77459aab250ff3.tar.xz linux-cf57a308436653f3094590202c77459aab250ff3.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/qla1280.c')
| -rw-r--r-- | drivers/scsi/qla1280.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index b818b9bfe678..8953991462d7 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c @@ -4209,7 +4209,7 @@ qla1280_setup(char *s) } -static int +static int __init qla1280_get_token(char *str) { char *sep; |