aboutsummaryrefslogtreecommitdiffstats
path: root/arch/unicore32/kernel/traps.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-04-07 11:15:50 -0700
committerGrant Likely <grant.likely@secretlab.ca>2011-04-07 11:15:50 -0700
commit454abcc57f1d48a976291bc4af73b5f087e21d70 (patch)
tree5bba999ea3f31527da02b60604531cc5fb52ea57 /arch/unicore32/kernel/traps.c
parent88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff)
parent6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff)
downloadkernel_samsung_smdk4412-454abcc57f1d48a976291bc4af73b5f087e21d70.zip
kernel_samsung_smdk4412-454abcc57f1d48a976291bc4af73b5f087e21d70.tar.gz
kernel_samsung_smdk4412-454abcc57f1d48a976291bc4af73b5f087e21d70.tar.bz2
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'arch/unicore32/kernel/traps.c')
-rw-r--r--arch/unicore32/kernel/traps.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c
index 25abbb1..254e36f 100644
--- a/arch/unicore32/kernel/traps.c
+++ b/arch/unicore32/kernel/traps.c
@@ -22,7 +22,6 @@
#include <linux/delay.h>
#include <linux/hardirq.h>
#include <linux/init.h>
-#include <linux/uaccess.h>
#include <linux/atomic.h>
#include <linux/unistd.h>