[NETFILTER]: ebtables: add --snap-arp option

[linux-2.6] / include / asm-m68k / pgtable.h

diff --git a/include/asm-m68k/pgtable.h b/include/asm-m68k/pgtable.h
index 0eef32778df25e261337d26e6a56df17834be026..f3aa05377987d0a08b50a040c56064fc87303bd3 100644 (file)
--- a/include/asm-m68k/pgtable.h
+++ b/include/asm-m68k/pgtable.h
@@ -3,7 +3,6 @@
 
 #include <asm-generic/4level-fixup.h>
 
-#include <linux/config.h>
 #include <asm/setup.h>
 
 #ifndef __ASSEMBLY__
@@ -61,7 +60,7 @@
 #define PTRS_PER_PGD   128
 #endif
 #define USER_PTRS_PER_PGD      (TASK_SIZE/PGDIR_SIZE)
-#define FIRST_USER_PGD_NR      0
+#define FIRST_USER_ADDRESS     0
 
 /* Virtual address region for use by kernel_map() */
 #ifdef CONFIG_SUN3
@@ -141,9 +140,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
 
 #define kern_addr_valid(addr)  (1)
 
-#define io_remap_page_range(vma, vaddr, paddr, size, prot)             \
-               remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
-
 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot)                \
                remap_pfn_range(vma, vaddr, pfn, size, prot)