diff options
| author | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-15 14:11:45 -0400 |
| commit | ee3e542fec6e69bc9fb668698889a37d93950ddf (patch) | |
| tree | e74ee766a4764769ef1d3d45d266b4dea64101d3 /arch/avr32/include/asm | |
| parent | fe2a801b50c0bb8039d627e5ae1fec249d10ff39 (diff) | |
| parent | f1d6e17f540af37bb1891480143669ba7636c4cf (diff) | |
Merge remote-tracking branch 'linus/master' into testing
Diffstat (limited to 'arch/avr32/include/asm')
| -rw-r--r-- | arch/avr32/include/asm/pgtable.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/avr32/include/asm/pgtable.h b/arch/avr32/include/asm/pgtable.h index 6fbfea61f7bb..4beff97e2033 100644 --- a/arch/avr32/include/asm/pgtable.h +++ b/arch/avr32/include/asm/pgtable.h | |||
| @@ -362,9 +362,6 @@ typedef pte_t *pte_addr_t; | |||
| 362 | 362 | ||
| 363 | #define kern_addr_valid(addr) (1) | 363 | #define kern_addr_valid(addr) (1) |
| 364 | 364 | ||
| 365 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | ||
| 366 | remap_pfn_range(vma, vaddr, pfn, size, prot) | ||
| 367 | |||
| 368 | /* No page table caches to initialize (?) */ | 365 | /* No page table caches to initialize (?) */ |
| 369 | #define pgtable_cache_init() do { } while(0) | 366 | #define pgtable_cache_init() do { } while(0) |
| 370 | 367 | ||