diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2002-02-20 20:00:54 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2002-02-20 20:00:54 +0000 |
| commit | 8847b8e61c030fded3e86cec0a3da3bea801f0df (patch) | |
| tree | b166eaf0071caf1ba357eb6ac00dc1c061352423 /include | |
| parent | 8a7f3127b977a3006b14aef983e719264ff9b60d (diff) | |
| parent | a814d16fe3abd6e8e5e2413425611833f07485a5 (diff) | |
Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5
into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mm.h | 2 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 580b32a99f93..6599c710fd37 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -585,7 +585,7 @@ static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * m extern struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr); -extern struct page * vmalloc_to_page(unsigned long adr); +extern struct page * vmalloc_to_page(void *addr); #endif /* __KERNEL__ */ diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 1def04889c3b..03d3d6eea25a 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -772,6 +772,7 @@ #define PCI_VENDOR_ID_3COM 0x10b7 #define PCI_DEVICE_ID_3COM_3C985 0x0001 #define PCI_DEVICE_ID_3COM_3C339 0x3390 +#define PCI_DEVICE_ID_3COM_3C359 0x3590 #define PCI_DEVICE_ID_3COM_3C590 0x5900 #define PCI_DEVICE_ID_3COM_3C595TX 0x5950 #define PCI_DEVICE_ID_3COM_3C595T4 0x5951 |