diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-13 03:28:45 -0400 |
| commit | 9343af084c7e8911897b0883042ee690cee3aaef (patch) | |
| tree | 6211a4bdc84690bec6530d27a3abb19f5e8bb8f3 /arch/alpha/kernel/process.c | |
| parent | e182c77cc291456eed127b1472952ddb59a81a9d (diff) | |
| parent | 0d0fb0f9c5fddef4a10242fe3337f00f528a3099 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
lib/Kconfig.debug
Diffstat (limited to 'arch/alpha/kernel/process.c')
| -rw-r--r-- | arch/alpha/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/process.c b/arch/alpha/kernel/process.c index 289039bb6bb2..395a464353b8 100644 --- a/arch/alpha/kernel/process.c +++ b/arch/alpha/kernel/process.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/stddef.h> | 17 | #include <linux/stddef.h> |
| 18 | #include <linux/unistd.h> | 18 | #include <linux/unistd.h> |
| 19 | #include <linux/ptrace.h> | 19 | #include <linux/ptrace.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/user.h> | 20 | #include <linux/user.h> |
| 22 | #include <linux/time.h> | 21 | #include <linux/time.h> |
| 23 | #include <linux/major.h> | 22 | #include <linux/major.h> |
| @@ -28,6 +27,7 @@ | |||
| 28 | #include <linux/reboot.h> | 27 | #include <linux/reboot.h> |
| 29 | #include <linux/tty.h> | 28 | #include <linux/tty.h> |
| 30 | #include <linux/console.h> | 29 | #include <linux/console.h> |
| 30 | #include <linux/slab.h> | ||
| 31 | 31 | ||
| 32 | #include <asm/reg.h> | 32 | #include <asm/reg.h> |
| 33 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |