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
/
cpufreq-pxa3xx.c
diff --git
a/arch/arm/mach-pxa/cpufreq-pxa3xx.c
b/arch/arm/mach-pxa/cpufreq-pxa3xx.c
index
968c830
..
67f34a8
100644
(file)
--- a/
arch/arm/mach-pxa/cpufreq-pxa3xx.c
+++ b/
arch/arm/mach-pxa/cpufreq-pxa3xx.c
@@
-15,8
+15,6
@@
#include <linux/init.h>
#include <linux/cpufreq.h>
#include <linux/init.h>
#include <linux/cpufreq.h>
-#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
#include <mach/pxa3xx-regs.h>
#include "generic.h"
#include <mach/pxa3xx-regs.h>
#include "generic.h"