diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /include/asm-cris/arch-v32/pgtable.h | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'include/asm-cris/arch-v32/pgtable.h')
| -rw-r--r-- | include/asm-cris/arch-v32/pgtable.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/include/asm-cris/arch-v32/pgtable.h b/include/asm-cris/arch-v32/pgtable.h deleted file mode 100644 index 08cb7ff7e4e7..000000000000 --- a/include/asm-cris/arch-v32/pgtable.h +++ /dev/null | |||
| @@ -1,9 +0,0 @@ | |||
| 1 | #ifndef _ASM_CRIS_ARCH_PGTABLE_H | ||
| 2 | #define _ASM_CRIS_ARCH_PGTABLE_H | ||
| 3 | |||
| 4 | /* Define the kernels virtual memory area. */ | ||
| 5 | #define VMALLOC_START KSEG_D | ||
| 6 | #define VMALLOC_END KSEG_E | ||
| 7 | #define VMALLOC_VMADDR(x) ((unsigned long)(x)) | ||
| 8 | |||
| 9 | #endif /* _ASM_CRIS_ARCH_PGTABLE_H */ | ||