projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[linux-2.6-block.git]
/
arch
/
arm
/
mach-pxa
/
tosa.c
diff --git
a/arch/arm/mach-pxa/tosa.c
b/arch/arm/mach-pxa/tosa.c
index 168267a5dfb3e3f80775599990c5d54bba81acc3..117ad5920e53aefb56ce25e683002498b0fecfc0 100644
(file)
--- a/
arch/arm/mach-pxa/tosa.c
+++ b/
arch/arm/mach-pxa/tosa.c
@@
-31,7
+31,6
@@
#include <linux/input.h>
#include <linux/gpio.h>
#include <linux/pda_power.h>
-#include <linux/rfkill.h>
#include <linux/spi/spi.h>
#include <asm/setup.h>