diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 16:02:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-20 16:02:06 -0700 |
| commit | ebc79c4f8da0f92efa968e0328f32334a2ce80cf (patch) | |
| tree | 8a3ff82f4b7ae26df4f7c8b4c852748f7533a418 /drivers | |
| parent | dcbb5593d980bbf4ceef320f8c75210398ed84db (diff) | |
| parent | 5ac7687860dbfd3dd90e09d2c10dd31de91f20c2 (diff) | |
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 'drivers')
| -rw-r--r-- | drivers/scsi/fcoe/libfcoe.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/ibmvscsi/ibmvscsi.c | 1 | ||||
| -rw-r--r-- | drivers/video/console/vgacon.c | 1 | ||||
| -rw-r--r-- | drivers/xen/evtchn.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c index 62a4c2026072..11ae5c94608b 100644 --- a/drivers/scsi/fcoe/libfcoe.c +++ b/drivers/scsi/fcoe/libfcoe.c @@ -29,7 +29,6 @@ #include <linux/ethtool.h> #include <linux/if_ether.h> #include <linux/if_vlan.h> -#include <linux/netdevice.h> #include <linux/errno.h> #include <linux/bitops.h> #include <net/rtnetlink.h> diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index 9928704e235f..d9b0e9d31983 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c @@ -73,7 +73,6 @@ #include <linux/of.h> #include <asm/firmware.h> #include <asm/vio.h> -#include <asm/firmware.h> #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> #include <scsi/scsi_host.h> diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index 59d7d5ec17a4..74e96cf83b7e 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c @@ -180,7 +180,6 @@ static inline void vga_set_mem_top(struct vc_data *c) } #ifdef CONFIG_VGACON_SOFT_SCROLLBACK -#include <linux/slab.h> /* software scrollback */ static void *vgacon_scrollback; static int vgacon_scrollback_tail; diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c index af031950f9b1..79bedba44fee 100644 --- a/drivers/xen/evtchn.c +++ b/drivers/xen/evtchn.c @@ -38,7 +38,6 @@ #include <linux/string.h> #include <linux/errno.h> #include <linux/fs.h> -#include <linux/errno.h> #include <linux/miscdevice.h> #include <linux/major.h> #include <linux/proc_fs.h> |