git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
corgi_pm.c
diff --git
a/arch/arm/mach-pxa/corgi_pm.c
b/arch/arm/mach-pxa/corgi_pm.c
index
e352590
..
7f04b3a
100644
(file)
--- a/
arch/arm/mach-pxa/corgi_pm.c
+++ b/
arch/arm/mach-pxa/corgi_pm.c
@@
-24,7
+24,6
@@
#include <mach/sharpsl.h>
#include <mach/corgi.h>
-#include <mach/pxa-regs.h>
#include <mach/pxa2xx-regs.h>
#include <mach/pxa2xx-gpio.h>
#include "sharpsl.h"