diff options
author | 2009-09-20 16:02:06 -0700 | |
---|---|---|
committer | 2009-09-20 16:02:06 -0700 | |
commit | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (patch) | |
tree | 8a3ff82f4b7ae26df4f7c8b4c852748f7533a418 /include/acpi/acpi_bus.h | |
parent | loongson: fix cut-and-paste mis-merge (diff) | |
parent | includecheck fix: x86, cpu/common.c (diff) | |
download | linux-dev-ebc79c4f8da0f92efa968e0328f32334a2ce80cf.tar.xz linux-dev-ebc79c4f8da0f92efa968e0328f32334a2ce80cf.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6:
includecheck fix: x86, cpu/common.c
includecheck fix: kernel/trace, ring_buffer.c
includecheck fix: include/linux, ftrace.h
includecheck fix: include/linux, page_cgroup.h
includecheck fix: include/linux, aio.h
includecheck fix: include/drm, drm_memory.h
includecheck fix: include/acpi, acpi_bus.h
includecheck fix: drivers/xen, evtchn.c
includecheck fix: drivers/video, vgacon.c
includecheck fix: drivers/scsi, ibmvscsi.c
includecheck fix: drivers/scsi, libfcoe.c
includecheck fix: x86, shadow.c
includecheck fix: x86, traps.c
includecheck fix: um, helper.c
includecheck fix: s390, sys_s390.c
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 1fa3ffb7c93b..1b3b36068ca5 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -356,7 +356,6 @@ void acpi_remove_dir(struct acpi_device *); /* * Bind physical devices with ACPI devices */ -#include <linux/device.h> struct acpi_bus_type { struct list_head list; struct bus_type *bus; |