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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
drivers
/
acpi
/
processor_idle.c
diff --git
a/drivers/acpi/processor_idle.c
b/drivers/acpi/processor_idle.c
index
283c08f
..
cf5b1b7
100644
(file)
--- a/
drivers/acpi/processor_idle.c
+++ b/
drivers/acpi/processor_idle.c
@@
-41,7
+41,6
@@
#include <linux/pm_qos_params.h>
#include <linux/clockchips.h>
#include <linux/cpuidle.h>
-#include <linux/cpuidle.h>
/*
* Include the apic definitions for x86 to have the APIC timer related defines