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/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
include
/
acpi
/
processor.h
diff --git
a/include/acpi/processor.h
b/include/acpi/processor.h
index
26d79f6
..
76411b1
100644
(file)
--- a/
include/acpi/processor.h
+++ b/
include/acpi/processor.h
@@
-78,7
+78,6
@@
struct acpi_processor_cx {
struct acpi_processor_power {
struct cpuidle_device dev;
struct acpi_processor_cx *state;
- struct acpi_processor_cx *bm_state;
unsigned long bm_check_timestamp;
u32 default_state;
u32 bm_activity;