diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
commit | 16b5d462f73eb29d1f67fa01cc1ea66afdc72569 (patch) | |
tree | 5407bd573f4840e473ea27cbe61e5c7a07131fcd /include/asm-m68k | |
parent | ce8a076e11e7e5ee36007f9a3eee5bb3744cb8f6 (diff) |
Merge with Linux 2.3.99-pre2.
Diffstat (limited to 'include/asm-m68k')
-rw-r--r-- | include/asm-m68k/page.h | 3 | ||||
-rw-r--r-- | include/asm-m68k/pci.h | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h index 117abf25d..7cf002fb7 100644 --- a/include/asm-m68k/page.h +++ b/include/asm-m68k/page.h @@ -76,6 +76,9 @@ static inline void clear_page(void *page) #define copy_page(to,from) memcpy((to), (from), PAGE_SIZE) #endif +#define clear_user_page(page, vaddr) clear_page(page) +#define copy_user_page(to, from, vaddr) copy_page(to, from) + /* * These are used to make use of C type-checking.. */ diff --git a/include/asm-m68k/pci.h b/include/asm-m68k/pci.h index 76915264d..efbaf41b5 100644 --- a/include/asm-m68k/pci.h +++ b/include/asm-m68k/pci.h @@ -35,4 +35,9 @@ struct pci_bus_info #define pcibios_assign_all_busses() 0 +extern inline void pcibios_set_master(struct pci_dev *dev) +{ + /* No special bus mastering setup handling */ +} + #endif /* _ASM_M68K_PCI_H */ |