summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-21 15:57:50 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-21 15:57:50 -0700
commit9738cbe32192919356397f1e24f9b26e1f574fbb (patch)
tree75caa6d21a8b68a36285ee787095fb05b14627fb /include
parent58229a18994215bbfe0bcd1c99d2e039f30b076b (diff)
parent05dc16d6a175139a5872d08db56ee277ec90df5b (diff)
downloadlwn-9738cbe32192919356397f1e24f9b26e1f574fbb.tar.gz
lwn-9738cbe32192919356397f1e24f9b26e1f574fbb.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: [PARISC] unwinder improvements [PARISC] Fix unwinder on 64-bit kernels [PARISC] Handle wrapping in expand_upwards() [PARISC] stop lcd driver from stripping initial whitespace
Diffstat (limited to 'include')
-rw-r--r--include/asm-parisc/system.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-parisc/system.h b/include/asm-parisc/system.h
index 7e9afa720d43..21fbfc5afd02 100644
--- a/include/asm-parisc/system.h
+++ b/include/asm-parisc/system.h
@@ -188,7 +188,6 @@ static inline void set_eiem(unsigned long val)
# define __lock_aligned __attribute__((__section__(".data.lock_aligned")))
#endif
-#define KERNEL_START (0x10100000 - 0x1000)
#define arch_align_stack(x) (x)
#endif