diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-14 19:51:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-14 19:51:26 -0800 |
| commit | c2919f2ab9a2bb961e97c61bcf94f81d2c7e9feb (patch) | |
| tree | d2dcc94bb6c8426c09d6847c8184d17e8b4f71a0 /include | |
| parent | 9316fcacb89c59fe556c48587ac02cd7f5d38045 (diff) | |
| parent | e720b9e498b6bbb1b4f3b3d2f8e9a78578aafef7 (diff) | |
| download | linux-3.10-c2919f2ab9a2bb961e97c61bcf94f81d2c7e9feb.tar.gz linux-3.10-c2919f2ab9a2bb961e97c61bcf94f81d2c7e9feb.tar.bz2 linux-3.10-c2919f2ab9a2bb961e97c61bcf94f81d2c7e9feb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
IDE: fix sparse signed-ness errors with host->host_busy
ide: fix suspend regression
tx4938ide: Fix build error due to read_sff_dma_status moving
ide: remove unused CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ
sl82c105: remove dead code
via82cxxx: fix cable warning message
ide: can't use SSD/non-rotational queue flag for all CFA devices
it821x.c: use dev->revision instead of pci_read_config_byte
it821x: Add ultra_mask quirk for Vortex86SX
ide: fix accidental LOCKDEP breakage caused by local_irq_set() removal
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ide.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h index 3644f632338..194da5a4b0d 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -871,7 +871,7 @@ struct ide_host { ide_hwif_t *cur_port; /* for hosts requiring serialization */ /* used for hosts requiring serialization */ - volatile long host_busy; + volatile unsigned long host_busy; }; #define IDE_HOST_BUSY 0 diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index d543365518a..d56ad9c21c0 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2174,6 +2174,7 @@ #define PCI_DEVICE_ID_RDC_R6040 0x6040 #define PCI_DEVICE_ID_RDC_R6060 0x6060 #define PCI_DEVICE_ID_RDC_R6061 0x6061 +#define PCI_DEVICE_ID_RDC_D1010 0x1010 #define PCI_VENDOR_ID_LENOVO 0x17aa |