Commit 7b7e8b76 authored by Ben Collins's avatar Ben Collins

Merge http://linux.bkbits.net/linux-2.5

into debian.org:/usr/src/kernel/sparc-2.6
parents 755fa12b dc3c0c8c
...@@ -8,8 +8,11 @@ ...@@ -8,8 +8,11 @@
#include <linux/config.h> #include <linux/config.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#ifdef __KERNEL__
#include <asm/mbus.h> #include <asm/mbus.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#endif
/* /*
* Sparc section types * Sparc section types
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment