diff options
| author | Michal Simek <monstr@monstr.eu> | 2012-03-30 06:10:03 -0400 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2012-03-30 06:10:03 -0400 |
| commit | 6a4770e335bd4df0a4577146f76e116ab6e23f40 (patch) | |
| tree | 305056c20b6ccf3a4fed00e9e32f3a1dd039cd70 /arch/alpha/lib | |
| parent | ac64a9caa55bdfd8d24784f25c68cb7919ddabe3 (diff) | |
| parent | f52b69f86e27903d6896ed5fa7cd280fec8de532 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
Diffstat (limited to 'arch/alpha/lib')
| -rw-r--r-- | arch/alpha/lib/stacktrace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/alpha/lib/stacktrace.c b/arch/alpha/lib/stacktrace.c index 6d432e42aedc..5e832161e6d2 100644 --- a/arch/alpha/lib/stacktrace.c +++ b/arch/alpha/lib/stacktrace.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 2 | #include <asm/system.h> | ||
| 3 | 2 | ||
| 4 | typedef unsigned int instr; | 3 | typedef unsigned int instr; |
| 5 | 4 | ||