diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-11 17:06:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-11 17:06:16 -0700 |
| commit | 7cb7beb31aa3d941833b6a6e553687422c31e4b6 (patch) | |
| tree | eb50ff31169a95b0635e7fba3e35a57a17ad30f1 /arch/ia64/include/asm/pgtable.h | |
| parent | 4d9c73f60efe7a76f086bc93f7ef22be9d78bed6 (diff) | |
| parent | e7369e01eb85550ed60dd1b0e120b69dfb03dc23 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6:
arch/ia64/kernel/iosapic: missing test after ioremap()
ia64/topology.c: exit cache_add_dev when kobject_init_and_add fails
arch/ia64/Makefile: Remove -mtune=merced in IA64 kernel build
IA64: includecheck fix: ia64, pgtable.h
IA64: includecheck fix: ia64, ia64_ksyms.c
ia64: boolean __test_and_clear_bit
Bug Fix arch/ia64/kernel/pci-dma.c: fix recursive dma_supported() call in iommu_dma_supported()
Diffstat (limited to 'arch/ia64/include/asm/pgtable.h')
| -rw-r--r-- | arch/ia64/include/asm/pgtable.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h index 0a9cc73d35c..8840a690d1e 100644 --- a/arch/ia64/include/asm/pgtable.h +++ b/arch/ia64/include/asm/pgtable.h @@ -155,7 +155,6 @@ #include <linux/bitops.h> #include <asm/cacheflush.h> #include <asm/mmu_context.h> -#include <asm/processor.h> /* * Next come the mappings that determine how mmap() protection bits |