diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-31 07:35:57 -0500 |
| commit | 2ca1a615835d9f4990f42102ab1f2ef434e7e89c (patch) | |
| tree | 726cf3d5f29a6c66c44e4bd68e7ebed2fd83d059 /arch/alpha | |
| parent | e12f0102ac81d660c9f801d0a0e10ccf4537a9de (diff) | |
| parent | 6a94cb73064c952255336cc57731904174b2c58f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/x86/kernel/io_apic.c
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/include/asm/io.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/alpha/include/asm/io.h b/arch/alpha/include/asm/io.h index e971ab000f95..eda9b909aa05 100644 --- a/arch/alpha/include/asm/io.h +++ b/arch/alpha/include/asm/io.h | |||
| @@ -96,9 +96,6 @@ static inline dma_addr_t __deprecated isa_page_to_bus(struct page *page) | |||
| 96 | return page_to_phys(page); | 96 | return page_to_phys(page); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | /* This depends on working iommu. */ | ||
| 100 | #define BIO_VMERGE_BOUNDARY (alpha_mv.mv_pci_tbi ? PAGE_SIZE : 0) | ||
| 101 | |||
| 102 | /* Maximum PIO space address supported? */ | 99 | /* Maximum PIO space address supported? */ |
| 103 | #define IO_SPACE_LIMIT 0xffff | 100 | #define IO_SPACE_LIMIT 0xffff |
| 104 | 101 | ||