diff options
| author | Paul Mackerras <paulus@samba.org> | 2009-04-21 23:02:09 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-04-21 23:02:09 -0400 |
| commit | 5bd3ef84d73c2ea7b4babbad060909753c4828d4 (patch) | |
| tree | fdf2bafb48ae1ed03175f6c77a7548a181e69ee9 /include/acpi/acpi_bus.h | |
| parent | 0658c16056660886ea2f35c4f038be70a94b1532 (diff) | |
| parent | 6d25b688ecc488753af3c9e6f6a9a575b863cf37 (diff) | |
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 into merge
Diffstat (limited to 'include/acpi/acpi_bus.h')
| -rw-r--r-- | include/acpi/acpi_bus.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index a2228511d4be..c34b11022908 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
| @@ -270,7 +270,6 @@ struct acpi_device { | |||
| 270 | struct list_head children; | 270 | struct list_head children; |
| 271 | struct list_head node; | 271 | struct list_head node; |
| 272 | struct list_head wakeup_list; | 272 | struct list_head wakeup_list; |
| 273 | struct list_head g_list; | ||
| 274 | struct acpi_device_status status; | 273 | struct acpi_device_status status; |
| 275 | struct acpi_device_flags flags; | 274 | struct acpi_device_flags flags; |
| 276 | struct acpi_device_pnp pnp; | 275 | struct acpi_device_pnp pnp; |