diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma-mapping.h | 1 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index c0f6c3cd788c..91b761846061 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h | |||
| @@ -58,6 +58,7 @@ struct dma_map_ops { | |||
| 58 | enum dma_data_direction dir); | 58 | enum dma_data_direction dir); |
| 59 | int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); | 59 | int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); |
| 60 | int (*dma_supported)(struct device *dev, u64 mask); | 60 | int (*dma_supported)(struct device *dev, u64 mask); |
| 61 | int (*set_dma_mask)(struct device *dev, u64 mask); | ||
| 61 | int is_phys; | 62 | int is_phys; |
| 62 | }; | 63 | }; |
| 63 | 64 | ||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 555a8262fbc2..0d96be93b926 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -881,6 +881,7 @@ | |||
| 881 | #define PCI_DEVICE_ID_APPLE_SH_SUNGEM 0x0051 | 881 | #define PCI_DEVICE_ID_APPLE_SH_SUNGEM 0x0051 |
| 882 | #define PCI_DEVICE_ID_APPLE_U3L_AGP 0x0058 | 882 | #define PCI_DEVICE_ID_APPLE_U3L_AGP 0x0058 |
| 883 | #define PCI_DEVICE_ID_APPLE_U3H_AGP 0x0059 | 883 | #define PCI_DEVICE_ID_APPLE_U3H_AGP 0x0059 |
| 884 | #define PCI_DEVICE_ID_APPLE_U4_PCIE 0x005b | ||
| 884 | #define PCI_DEVICE_ID_APPLE_IPID2_AGP 0x0066 | 885 | #define PCI_DEVICE_ID_APPLE_IPID2_AGP 0x0066 |
| 885 | #define PCI_DEVICE_ID_APPLE_IPID2_ATA 0x0069 | 886 | #define PCI_DEVICE_ID_APPLE_IPID2_ATA 0x0069 |
| 886 | #define PCI_DEVICE_ID_APPLE_IPID2_FW 0x006a | 887 | #define PCI_DEVICE_ID_APPLE_IPID2_FW 0x006a |
