diff options
| author | David Howells <dhowells@redhat.com> | 2006-12-06 10:01:18 -0500 |
|---|---|---|
| committer | David Howells <dhowells@warthog.cambridge.redhat.com> | 2006-12-06 10:01:18 -0500 |
| commit | 4796b71fbb907ce6b8a9acf1852d3646a80b4576 (patch) | |
| tree | 6263f165446c581efdbb760205c1f85378fe6259 /drivers/scsi/aic7xxx/aic79xx_pci.h | |
| parent | 6d5aefb8eaa38e44b5b8cf60c812aceafc02d924 (diff) | |
| parent | ec0bf39a471bf6fcd01def2bd677128cea940b73 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/pcmcia/ds.c
Fix up merge failures with Linus's head and fix new compile failures.
Signed-Off-By: David Howells <dhowells@redhat.com>
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx_pci.h')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.h b/drivers/scsi/aic7xxx/aic79xx_pci.h index da45153668c7..16b7c70a673c 100644 --- a/drivers/scsi/aic7xxx/aic79xx_pci.h +++ b/drivers/scsi/aic7xxx/aic79xx_pci.h | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #define ID_AIC7901 0x800F9005FFFF9005ull | 51 | #define ID_AIC7901 0x800F9005FFFF9005ull |
| 52 | #define ID_AHA_29320A 0x8000900500609005ull | 52 | #define ID_AHA_29320A 0x8000900500609005ull |
| 53 | #define ID_AHA_29320ALP 0x8017900500449005ull | 53 | #define ID_AHA_29320ALP 0x8017900500449005ull |
| 54 | #define ID_AHA_29320LPE 0x8017900500459005ull | ||
| 54 | 55 | ||
| 55 | #define ID_AIC7901A 0x801E9005FFFF9005ull | 56 | #define ID_AIC7901A 0x801E9005FFFF9005ull |
| 56 | #define ID_AHA_29320LP 0x8014900500449005ull | 57 | #define ID_AHA_29320LP 0x8014900500449005ull |