projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pm-cpuidle'
[linux-block.git]
/
include
/
acpi
/
acpi_bus.h
diff --git
a/include/acpi/acpi_bus.h
b/include/acpi/acpi_bus.h
index 22650cd9e72aba8c926704bad6af98d542adafaa..02e113bb8b7d5c777fdc435a5285208238ce66e9 100644
(file)
--- a/
include/acpi/acpi_bus.h
+++ b/
include/acpi/acpi_bus.h
@@
-167,9
+167,8
@@
struct acpi_device_flags {
u32 removable:1;
u32 ejectable:1;
u32 power_manageable:1;
- u32 eject_pending:1;
u32 match_driver:1;
- u32 reserved:2
6
;
+ u32 reserved:2
7
;
};
/* File System */