diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-01-24 06:47:48 -0500 |
| commit | befddb21c845f8fb49e637997891ef97c6a869dc (patch) | |
| tree | 0e7629123184f2dd50291ad6d477b894175f0f26 /drivers/scsi/g_NCR5380.c | |
| parent | e716efde75267eab919cdb2bef5b2cb77f305326 (diff) | |
| parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) | |
Merge tag 'v3.8-rc4' into irq/core
Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/scsi/g_NCR5380.c')
| -rw-r--r-- | drivers/scsi/g_NCR5380.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c index 1a5954f0915a..5041f925c191 100644 --- a/drivers/scsi/g_NCR5380.c +++ b/drivers/scsi/g_NCR5380.c | |||
| @@ -939,7 +939,7 @@ module_param(dtc_3181e, int, 0); | |||
| 939 | MODULE_LICENSE("GPL"); | 939 | MODULE_LICENSE("GPL"); |
| 940 | 940 | ||
| 941 | #ifndef SCSI_G_NCR5380_MEM | 941 | #ifndef SCSI_G_NCR5380_MEM |
| 942 | static struct isapnp_device_id id_table[] __devinitdata = { | 942 | static struct isapnp_device_id id_table[] = { |
| 943 | { | 943 | { |
| 944 | ISAPNP_ANY_ID, ISAPNP_ANY_ID, | 944 | ISAPNP_ANY_ID, ISAPNP_ANY_ID, |
| 945 | ISAPNP_VENDOR('D', 'T', 'C'), ISAPNP_FUNCTION(0x436e), | 945 | ISAPNP_VENDOR('D', 'T', 'C'), ISAPNP_FUNCTION(0x436e), |