diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:35:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-27 20:35:17 -0400 |
| commit | b2ab040db85835e54c7559533df7f85902617926 (patch) | |
| tree | b23cbdca55935c497cb88b588e4e8b088d6ab7ab /include | |
| parent | 1f57389a38dc1e8be167ec601f39f78f0bed3a96 (diff) | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
| download | linux-b2ab040db85835e54c7559533df7f85902617926.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/bitops.h | 1 | ||||
| -rw-r--r-- | include/asm-x86_64/pci.h | 6 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-arm/bitops.h b/include/asm-arm/bitops.h index aad7aad026b319..e007dd990da568 100644 --- a/include/asm-arm/bitops.h +++ b/include/asm-arm/bitops.h @@ -347,7 +347,6 @@ static inline unsigned long __ffs(unsigned long word) * the clz instruction for much better code efficiency. */ -static __inline__ int generic_fls(int x); #define fls(x) \ ( __builtin_constant_p(x) ? generic_fls(x) : \ ({ int __r; asm("clz\t%0, %1" : "=r"(__r) : "r"(x) : "cc"); 32-__r; }) ) diff --git a/include/asm-x86_64/pci.h b/include/asm-x86_64/pci.h index 5a82a6762c2183..eeb3088a1c9e3d 100644 --- a/include/asm-x86_64/pci.h +++ b/include/asm-x86_64/pci.h @@ -50,10 +50,10 @@ extern int iommu_setup(char *opt); * address space. The networking and block device layers use * this boolean for bounce buffer decisions * - * On x86-64 it mostly equals, but we set it to zero to tell some subsystems - * that an hard or soft IOMMU is available. + * On AMD64 it mostly equals, but we set it to zero to tell some subsystems + * that an IOMMU is available. */ -#define PCI_DMA_BUS_IS_PHYS 0 +#define PCI_DMA_BUS_IS_PHYS (no_iommu ? 1 : 0) /* * x86-64 always supports DAC, but sometimes it is useful to force diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index f74ed946247550..71834f05504f3b 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -723,6 +723,7 @@ #define PCI_DEVICE_ID_HP_DIVA_EVEREST 0x1282 #define PCI_DEVICE_ID_HP_DIVA_AUX 0x1290 #define PCI_DEVICE_ID_HP_DIVA_RMP3 0x1301 +#define PCI_DEVICE_ID_HP_DIVA_HURRICANE 0x132a #define PCI_DEVICE_ID_HP_CISS 0x3210 #define PCI_DEVICE_ID_HP_CISSA 0x3220 #define PCI_DEVICE_ID_HP_CISSB 0x3222 @@ -2696,6 +2697,7 @@ #define PCI_SUBVENDOR_ID_EXSYS 0xd84d #define PCI_SUBDEVICE_ID_EXSYS_4014 0x4014 +#define PCI_SUBDEVICE_ID_EXSYS_4055 0x4055 #define PCI_VENDOR_ID_TIGERJET 0xe159 #define PCI_DEVICE_ID_TIGERJET_300 0x0001 |