From: Tim Schmielau <tim@physik3.uni-rostock.de>

Fix more missing includes as a preparatory step for not including sched.h
from module.h.  This should now cover i386, x86_64, alpha, arm, ppc64, and
s390 architectures.

Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 Documentation/firmware_class/firmware_sample_driver.c         |    1 +
 Documentation/firmware_class/firmware_sample_firmware_class.c |    2 ++
 arch/arm/common/amba.c                                        |    2 ++
 arch/arm/common/scoop.c                                       |    3 +++
 arch/arm/kernel/arthur.c                                      |    1 +
 arch/arm/mach-imx/generic.c                                   |    2 ++
 arch/arm/mach-integrator/clock.c                              |    1 +
 arch/arm/mach-integrator/integrator_ap.c                      |    1 +
 arch/arm/mach-integrator/lm.c                                 |    1 +
 arch/arm/mach-iop3xx/iq31244-pci.c                            |    2 ++
 arch/arm/mach-iop3xx/iq80321-pci.c                            |    2 ++
 arch/arm/mach-iop3xx/iq80331-pci.c                            |    2 ++
 arch/arm/mach-iop3xx/iq80332-pci.c                            |    2 ++
 arch/arm/mach-pxa/generic.c                                   |    1 +
 arch/arm/mach-sa1100/generic.c                                |    1 +
 arch/arm/mach-versatile/clock.c                               |    1 +
 arch/arm/plat-omap/clock.c                                    |    1 +
 arch/ia64/kernel/cyclone.c                                    |    1 +
 arch/ppc64/kernel/hvcserver.c                                 |    2 ++
 arch/ppc64/kernel/of_device.c                                 |    2 ++
 arch/ppc64/lib/locks.c                                        |    2 ++
 drivers/base/class.c                                          |    1 +
 drivers/base/platform.c                                       |    1 +
 drivers/block/cciss_scsi.c                                    |   10 +++++++---
 drivers/char/agp/ati-agp.c                                    |    2 ++
 drivers/char/agp/i460-agp.c                                   |    2 ++
 drivers/char/agp/isoch.c                                      |    1 +
 drivers/char/agp/sworks-agp.c                                 |    2 ++
 drivers/char/drm/drm_sysfs.c                                  |    2 ++
 drivers/infiniband/core/sa_query.c                            |    1 +
 drivers/infiniband/hw/mthca/mthca_av.c                        |    2 ++
 drivers/infiniband/hw/mthca/mthca_mad.c                       |    3 +++
 drivers/infiniband/hw/mthca/mthca_mcg.c                       |    2 ++
 drivers/infiniband/hw/mthca/mthca_profile.c                   |    2 ++
 drivers/infiniband/hw/mthca/mthca_qp.c                        |    2 ++
 drivers/infiniband/hw/mthca/mthca_reset.c                     |    1 +
 drivers/input/joystick/joydump.c                              |    1 +
 drivers/macintosh/macio_asic.c                                |    2 ++
 drivers/mca/mca-device.c                                      |    1 +
 drivers/media/common/ir-common.c                              |    1 +
 drivers/media/dvb/frontends/bcm3510.c                         |    2 ++
 drivers/media/dvb/frontends/dib3000mb.c                       |    2 ++
 drivers/media/dvb/frontends/dib3000mc.c                       |    2 ++
 drivers/media/dvb/frontends/dvb_dummy_fe.c                    |    2 ++
 drivers/media/dvb/frontends/lgdt330x.c                        |    2 ++
 drivers/media/dvb/frontends/mt312.c                           |    2 ++
 drivers/media/dvb/frontends/mt352.c                           |    2 ++
 drivers/media/dvb/frontends/nxt2002.c                         |    2 ++
 drivers/media/dvb/frontends/or51132.c                         |    2 ++
 drivers/media/dvb/frontends/or51211.c                         |    2 ++
 drivers/media/dvb/frontends/sp8870.c                          |    2 ++
 drivers/media/dvb/frontends/sp887x.c                          |    2 ++
 drivers/media/dvb/frontends/stv0297.c                         |    1 +
 drivers/media/dvb/frontends/tda1004x.c                        |    3 +++
 drivers/message/i2o/device.c                                  |    2 ++
 drivers/message/i2o/driver.c                                  |    3 +++
 drivers/message/i2o/exec-osm.c                                |    4 ++++
 drivers/message/i2o/iop.c                                     |    1 +
 drivers/mtd/chips/jedec.c                                     |    1 +
 drivers/mtd/devices/lart.c                                    |    1 +
 drivers/mtd/devices/phram.c                                   |    1 +
 drivers/mtd/maps/bast-flash.c                                 |    1 +
 drivers/mtd/maps/ceiva.c                                      |    1 +
 drivers/mtd/maps/dc21285.c                                    |    1 +
 drivers/mtd/maps/dilnetpc.c                                   |    5 ++++-
 drivers/mtd/maps/epxa10db-flash.c                             |    5 ++++-
 drivers/mtd/maps/fortunet.c                                   |    5 ++++-
 drivers/mtd/maps/ixp2000.c                                    |    6 ++++--
 drivers/mtd/maps/ixp4xx.c                                     |    7 +++++--
 drivers/mtd/maps/lubbock-flash.c                              |    3 +++
 drivers/mtd/maps/mainstone-flash.c                            |    3 +++
 drivers/mtd/maps/omap-toto-flash.c                            |    2 +-
 drivers/mtd/maps/omap_nor.c                                   |    2 ++
 drivers/mtd/maps/pci.c                                        |    1 +
 drivers/mtd/maps/plat-ram.c                                   |    1 +
 drivers/mtd/maps/tqm8xxl.c                                    |    4 +++-
 drivers/mtd/nand/s3c2410.c                                    |    1 +
 drivers/pci/hotplug/cpcihp_generic.c                          |    1 +
 drivers/pci/hotplug/cpcihp_zt5550.c                           |    1 +
 drivers/pci/hotplug/fakephp.c                                 |    2 ++
 drivers/pci/hotplug/rpadlpar_core.c                           |    3 +++
 drivers/pci/hotplug/rpaphp_pci.c                              |    4 +++-
 drivers/pci/hotplug/rpaphp_slot.c                             |    3 +++
 drivers/pci/pci-driver.c                                      |    2 ++
 drivers/pci/pci.c                                             |    1 +
 drivers/pci/pcie/portdrv_core.c                               |    2 ++
 drivers/pci/pcie/portdrv_pci.c                                |    1 +
 drivers/pci/rom.c                                             |    1 +
 drivers/pnp/manager.c                                         |    2 ++
 drivers/pnp/pnpbios/rsparser.c                                |    2 ++
 drivers/s390/cio/cmf.c                                        |    3 +++
 drivers/s390/cio/device.c                                     |    1 +
 drivers/s390/cio/device_fsm.c                                 |    2 ++
 drivers/scsi/scsi_transport_iscsi.c                           |    4 ++++
 drivers/scsi/sym53c8xx_2/sym_hipd.c                           |    3 +++
 drivers/scsi/sym53c8xx_2/sym_hipd.h                           |    2 ++
 drivers/sh/superhyway/superhyway.c                            |    2 ++
 drivers/usb/host/ohci-omap.c                                  |    3 +++
 drivers/zorro/zorro-sysfs.c                                   |    1 +
 drivers/zorro/zorro.c                                         |    2 ++
 include/linux/i2o.h                                           |    8 ++++++--
 include/linux/mtd/map.h                                       |    3 +++
 include/linux/textsearch.h                                    |    1 +
 kernel/params.c                                               |    1 +
 lib/kobject.c                                                 |    1 +
 lib/sort.c                                                    |    1 +
 106 files changed, 209 insertions(+), 15 deletions(-)

diff -puN arch/arm/common/amba.c~fix-more-missing-includes arch/arm/common/amba.c
--- devel/arch/arm/common/amba.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/common/amba.c	2005-10-11 00:34:52.000000000 -0700
@@ -10,6 +10,8 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
diff -puN arch/arm/common/scoop.c~fix-more-missing-includes arch/arm/common/scoop.c
--- devel/arch/arm/common/scoop.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/common/scoop.c	2005-10-11 00:34:52.000000000 -0700
@@ -12,6 +12,9 @@
  */
 
 #include <linux/device.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
 #include <asm/io.h>
 #include <asm/hardware/scoop.h>
 
diff -puN arch/arm/kernel/arthur.c~fix-more-missing-includes arch/arm/kernel/arthur.c
--- devel/arch/arm/kernel/arthur.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/kernel/arthur.c	2005-10-11 00:34:52.000000000 -0700
@@ -18,6 +18,7 @@
 #include <linux/stddef.h>
 #include <linux/signal.h>
 #include <linux/init.h>
+#include <linux/sched.h>
 
 #include <asm/ptrace.h>
 
diff -puN arch/arm/mach-imx/generic.c~fix-more-missing-includes arch/arm/mach-imx/generic.c
--- devel/arch/arm/mach-imx/generic.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-imx/generic.c	2005-10-11 00:34:52.000000000 -0700
@@ -26,6 +26,8 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/string.h>
+
 #include <asm/arch/imxfb.h>
 #include <asm/hardware.h>
 #include <asm/arch/imx-regs.h>
diff -puN arch/arm/mach-integrator/clock.c~fix-more-missing-includes arch/arm/mach-integrator/clock.c
--- devel/arch/arm/mach-integrator/clock.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-integrator/clock.c	2005-10-11 00:34:52.000000000 -0700
@@ -13,6 +13,7 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #include <asm/semaphore.h>
 #include <asm/hardware/clock.h>
diff -puN arch/arm/mach-integrator/integrator_ap.c~fix-more-missing-includes arch/arm/mach-integrator/integrator_ap.c
--- devel/arch/arm/mach-integrator/integrator_ap.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-integrator/integrator_ap.c	2005-10-11 00:34:52.000000000 -0700
@@ -30,6 +30,7 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
+#include <asm/param.h>		/* HZ */
 #include <asm/mach-types.h>
 #include <asm/hardware/amba.h>
 #include <asm/hardware/amba_kmi.h>
diff -puN arch/arm/mach-integrator/lm.c~fix-more-missing-includes arch/arm/mach-integrator/lm.c
--- devel/arch/arm/mach-integrator/lm.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-integrator/lm.c	2005-10-11 00:34:52.000000000 -0700
@@ -10,6 +10,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 
 #include <asm/arch/lm.h>
 
diff -puN arch/arm/mach-iop3xx/iq31244-pci.c~fix-more-missing-includes arch/arm/mach-iop3xx/iq31244-pci.c
--- devel/arch/arm/mach-iop3xx/iq31244-pci.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-iop3xx/iq31244-pci.c	2005-10-11 00:34:52.000000000 -0700
@@ -14,6 +14,8 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
diff -puN arch/arm/mach-iop3xx/iq80321-pci.c~fix-more-missing-includes arch/arm/mach-iop3xx/iq80321-pci.c
--- devel/arch/arm/mach-iop3xx/iq80321-pci.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-iop3xx/iq80321-pci.c	2005-10-11 00:34:52.000000000 -0700
@@ -14,6 +14,8 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
diff -puN arch/arm/mach-iop3xx/iq80331-pci.c~fix-more-missing-includes arch/arm/mach-iop3xx/iq80331-pci.c
--- devel/arch/arm/mach-iop3xx/iq80331-pci.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-iop3xx/iq80331-pci.c	2005-10-11 00:34:52.000000000 -0700
@@ -13,6 +13,8 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
diff -puN arch/arm/mach-iop3xx/iq80332-pci.c~fix-more-missing-includes arch/arm/mach-iop3xx/iq80332-pci.c
--- devel/arch/arm/mach-iop3xx/iq80332-pci.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-iop3xx/iq80332-pci.c	2005-10-11 00:34:52.000000000 -0700
@@ -13,6 +13,8 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
diff -puN arch/arm/mach-pxa/generic.c~fix-more-missing-includes arch/arm/mach-pxa/generic.c
--- devel/arch/arm/mach-pxa/generic.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-pxa/generic.c	2005-10-11 00:34:52.000000000 -0700
@@ -23,6 +23,7 @@
 #include <linux/device.h>
 #include <linux/ioport.h>
 #include <linux/pm.h>
+#include <linux/string.h>
 
 #include <asm/hardware.h>
 #include <asm/irq.h>
diff -puN arch/arm/mach-sa1100/generic.c~fix-more-missing-includes arch/arm/mach-sa1100/generic.c
--- devel/arch/arm/mach-sa1100/generic.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-sa1100/generic.c	2005-10-11 00:34:52.000000000 -0700
@@ -17,6 +17,7 @@
 #include <linux/pm.h>
 #include <linux/cpufreq.h>
 #include <linux/ioport.h>
+#include <linux/sched.h>	/* just for sched_clock() - funny that */
 
 #include <asm/div64.h>
 #include <asm/hardware.h>
diff -puN arch/arm/mach-versatile/clock.c~fix-more-missing-includes arch/arm/mach-versatile/clock.c
--- devel/arch/arm/mach-versatile/clock.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/mach-versatile/clock.c	2005-10-11 00:34:52.000000000 -0700
@@ -13,6 +13,7 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #include <asm/semaphore.h>
 #include <asm/hardware/clock.h>
diff -puN arch/arm/plat-omap/clock.c~fix-more-missing-includes arch/arm/plat-omap/clock.c
--- devel/arch/arm/plat-omap/clock.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/arm/plat-omap/clock.c	2005-10-11 00:34:52.000000000 -0700
@@ -13,6 +13,7 @@
 #include <linux/list.h>
 #include <linux/errno.h>
 #include <linux/err.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/semaphore.h>
diff -puN arch/ia64/kernel/cyclone.c~fix-more-missing-includes arch/ia64/kernel/cyclone.c
--- devel/arch/ia64/kernel/cyclone.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/ia64/kernel/cyclone.c	2005-10-11 00:34:52.000000000 -0700
@@ -2,6 +2,7 @@
 #include <linux/smp.h>
 #include <linux/time.h>
 #include <linux/errno.h>
+#include <linux/timex.h>
 #include <asm/io.h>
 
 /* IBM Summit (EXA) Cyclone counter code*/
diff -puN arch/ppc64/kernel/hvcserver.c~fix-more-missing-includes arch/ppc64/kernel/hvcserver.c
--- devel/arch/ppc64/kernel/hvcserver.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/ppc64/kernel/hvcserver.c	2005-10-11 00:34:52.000000000 -0700
@@ -22,6 +22,8 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/module.h>
+#include <linux/slab.h>
+
 #include <asm/hvcall.h>
 #include <asm/hvcserver.h>
 #include <asm/io.h>
diff -puN arch/ppc64/kernel/of_device.c~fix-more-missing-includes arch/ppc64/kernel/of_device.c
--- devel/arch/ppc64/kernel/of_device.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/ppc64/kernel/of_device.c	2005-10-11 00:34:52.000000000 -0700
@@ -4,6 +4,8 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mod_devicetable.h>
+#include <linux/slab.h>
+
 #include <asm/errno.h>
 #include <asm/of_device.h>
 
diff -puN arch/ppc64/lib/locks.c~fix-more-missing-includes arch/ppc64/lib/locks.c
--- devel/arch/ppc64/lib/locks.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/arch/ppc64/lib/locks.c	2005-10-11 00:34:52.000000000 -0700
@@ -17,6 +17,8 @@
 #include <linux/spinlock.h>
 #include <linux/module.h>
 #include <linux/stringify.h>
+#include <linux/smp.h>
+
 #include <asm/hvcall.h>
 #include <asm/iSeries/HvCall.h>
 
diff -puN Documentation/firmware_class/firmware_sample_driver.c~fix-more-missing-includes Documentation/firmware_class/firmware_sample_driver.c
--- devel/Documentation/firmware_class/firmware_sample_driver.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/Documentation/firmware_class/firmware_sample_driver.c	2005-10-11 00:34:52.000000000 -0700
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/string.h>
 
 #include "linux/firmware.h"
 
diff -puN Documentation/firmware_class/firmware_sample_firmware_class.c~fix-more-missing-includes Documentation/firmware_class/firmware_sample_firmware_class.c
--- devel/Documentation/firmware_class/firmware_sample_firmware_class.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/Documentation/firmware_class/firmware_sample_firmware_class.c	2005-10-11 00:34:52.000000000 -0700
@@ -14,6 +14,8 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/timer.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 #include <linux/firmware.h>
 
 
diff -puN drivers/base/class.c~fix-more-missing-includes drivers/base/class.c
--- devel/drivers/base/class.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/base/class.c	2005-10-11 00:34:52.000000000 -0700
@@ -17,6 +17,7 @@
 #include <linux/string.h>
 #include <linux/kdev_t.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 #include "base.h"
 
 #define to_class_attr(_attr) container_of(_attr, struct class_attribute, attr)
diff -puN drivers/base/platform.c~fix-more-missing-includes drivers/base/platform.c
--- devel/drivers/base/platform.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/base/platform.c	2005-10-11 00:34:52.000000000 -0700
@@ -16,6 +16,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/bootmem.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 
 struct device platform_bus = {
 	.bus_id		= "platform",
diff -puN drivers/block/cciss_scsi.c~fix-more-missing-includes drivers/block/cciss_scsi.c
--- devel/drivers/block/cciss_scsi.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/block/cciss_scsi.c	2005-10-11 00:34:52.000000000 -0700
@@ -28,13 +28,17 @@
    through the array controller.  Note in particular, neither 
    physical nor logical disks are presented through the scsi layer. */
 
+#include <linux/timer.h>
+#include <linux/completion.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+
+#include <asm/atomic.h>
+
 #include <scsi/scsi.h> 
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h> 
-#include <asm/atomic.h>
-#include <linux/timer.h>
-#include <linux/completion.h>
 
 #include "cciss_scsi.h"
 
diff -puN drivers/char/agp/ati-agp.c~fix-more-missing-includes drivers/char/agp/ati-agp.c
--- devel/drivers/char/agp/ati-agp.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/char/agp/ati-agp.c	2005-10-11 00:34:52.000000000 -0700
@@ -6,6 +6,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/agp_backend.h>
 #include <asm/agp.h>
 #include "agp.h"
diff -puN drivers/char/agp/i460-agp.c~fix-more-missing-includes drivers/char/agp/i460-agp.c
--- devel/drivers/char/agp/i460-agp.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/char/agp/i460-agp.c	2005-10-11 00:34:52.000000000 -0700
@@ -10,6 +10,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/agp_backend.h>
 
 #include "agp.h"
diff -puN drivers/char/agp/isoch.c~fix-more-missing-includes drivers/char/agp/isoch.c
--- devel/drivers/char/agp/isoch.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/char/agp/isoch.c	2005-10-11 00:34:52.000000000 -0700
@@ -6,6 +6,7 @@
 #include <linux/pci.h>
 #include <linux/agp_backend.h>
 #include <linux/module.h>
+#include <linux/slab.h>
 
 #include "agp.h"
 
diff -puN drivers/char/agp/sworks-agp.c~fix-more-missing-includes drivers/char/agp/sworks-agp.c
--- devel/drivers/char/agp/sworks-agp.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/char/agp/sworks-agp.c	2005-10-11 00:34:52.000000000 -0700
@@ -5,6 +5,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/agp_backend.h>
 #include "agp.h"
 
diff -puN drivers/char/drm/drm_sysfs.c~fix-more-missing-includes drivers/char/drm/drm_sysfs.c
--- devel/drivers/char/drm/drm_sysfs.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/char/drm/drm_sysfs.c	2005-10-11 00:34:52.000000000 -0700
@@ -15,6 +15,8 @@
 #include <linux/device.h>
 #include <linux/kdev_t.h>
 #include <linux/err.h>
+#include <linux/slab.h>
+#include <linux/string.h>
 
 #include "drm_core.h"
 #include "drmP.h"
diff -puN drivers/infiniband/core/sa_query.c~fix-more-missing-includes drivers/infiniband/core/sa_query.c
--- devel/drivers/infiniband/core/sa_query.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/infiniband/core/sa_query.c	2005-10-11 00:34:52.000000000 -0700
@@ -43,6 +43,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/kref.h>
 #include <linux/idr.h>
+#include <linux/workqueue.h>
 
 #include <rdma/ib_pack.h>
 #include <rdma/ib_sa.h>
diff -puN drivers/infiniband/hw/mthca/mthca_av.c~fix-more-missing-includes drivers/infiniband/hw/mthca/mthca_av.c
--- devel/drivers/infiniband/hw/mthca/mthca_av.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/infiniband/hw/mthca/mthca_av.c	2005-10-11 00:34:52.000000000 -0700
@@ -34,6 +34,8 @@
  */
 
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_cache.h>
diff -puN drivers/infiniband/hw/mthca/mthca_mad.c~fix-more-missing-includes drivers/infiniband/hw/mthca/mthca_mad.c
--- devel/drivers/infiniband/hw/mthca/mthca_mad.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/infiniband/hw/mthca/mthca_mad.c	2005-10-11 00:34:52.000000000 -0700
@@ -34,6 +34,9 @@
  * $Id: mthca_mad.c 1349 2004-12-16 21:09:43Z roland $
  */
 
+#include <linux/string.h>
+#include <linux/slab.h>
+
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_mad.h>
 #include <rdma/ib_smi.h>
diff -puN drivers/infiniband/hw/mthca/mthca_mcg.c~fix-more-missing-includes drivers/infiniband/hw/mthca/mthca_mcg.c
--- devel/drivers/infiniband/hw/mthca/mthca_mcg.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/infiniband/hw/mthca/mthca_mcg.c	2005-10-11 00:34:52.000000000 -0700
@@ -33,6 +33,8 @@
  */
 
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "mthca_dev.h"
 #include "mthca_cmd.h"
diff -puN drivers/infiniband/hw/mthca/mthca_profile.c~fix-more-missing-includes drivers/infiniband/hw/mthca/mthca_profile.c
--- devel/drivers/infiniband/hw/mthca/mthca_profile.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/infiniband/hw/mthca/mthca_profile.c	2005-10-11 00:34:52.000000000 -0700
@@ -35,6 +35,8 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "mthca_profile.h"
 
diff -puN drivers/infiniband/hw/mthca/mthca_qp.c~fix-more-missing-includes drivers/infiniband/hw/mthca/mthca_qp.c
--- devel/drivers/infiniband/hw/mthca/mthca_qp.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/infiniband/hw/mthca/mthca_qp.c	2005-10-11 00:34:52.000000000 -0700
@@ -36,6 +36,8 @@
  */
 
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include <rdma/ib_verbs.h>
 #include <rdma/ib_cache.h>
diff -puN drivers/infiniband/hw/mthca/mthca_reset.c~fix-more-missing-includes drivers/infiniband/hw/mthca/mthca_reset.c
--- devel/drivers/infiniband/hw/mthca/mthca_reset.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/infiniband/hw/mthca/mthca_reset.c	2005-10-11 00:34:52.000000000 -0700
@@ -37,6 +37,7 @@
 #include <linux/errno.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include "mthca_dev.h"
 #include "mthca_cmd.h"
diff -puN drivers/input/joystick/joydump.c~fix-more-missing-includes drivers/input/joystick/joydump.c
--- devel/drivers/input/joystick/joydump.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/input/joystick/joydump.c	2005-10-11 00:34:52.000000000 -0700
@@ -34,6 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 
 #define DRIVER_DESC	"Gameport data dumper module"
 
diff -puN drivers/macintosh/macio_asic.c~fix-more-missing-includes drivers/macintosh/macio_asic.c
--- devel/drivers/macintosh/macio_asic.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/macintosh/macio_asic.c	2005-10-11 00:34:52.000000000 -0700
@@ -17,6 +17,8 @@
 #include <linux/pci_ids.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/slab.h>
+
 #include <asm/machdep.h>
 #include <asm/macio.h>
 #include <asm/pmac_feature.h>
diff -puN drivers/mca/mca-device.c~fix-more-missing-includes drivers/mca/mca-device.c
--- devel/drivers/mca/mca-device.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mca/mca-device.c	2005-10-11 00:34:52.000000000 -0700
@@ -29,6 +29,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/mca.h>
+#include <linux/string.h>
 
 /**
  *	mca_device_read_stored_pos - read POS register from stored data
diff -puN drivers/media/common/ir-common.c~fix-more-missing-includes drivers/media/common/ir-common.c
--- devel/drivers/media/common/ir-common.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/common/ir-common.c	2005-10-11 00:34:52.000000000 -0700
@@ -22,6 +22,7 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/string.h>
 #include <media/ir-common.h>
 
 /* -------------------------------------------------------------------------- */
diff -puN drivers/media/dvb/frontends/bcm3510.c~fix-more-missing-includes drivers/media/dvb/frontends/bcm3510.c
--- devel/drivers/media/dvb/frontends/bcm3510.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/bcm3510.c	2005-10-11 00:34:52.000000000 -0700
@@ -37,6 +37,8 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <linux/jiffies.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "dvb_frontend.h"
 #include "bcm3510.h"
diff -puN drivers/media/dvb/frontends/dib3000mb.c~fix-more-missing-includes drivers/media/dvb/frontends/dib3000mb.c
--- devel/drivers/media/dvb/frontends/dib3000mb.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/dib3000mb.c	2005-10-11 00:34:52.000000000 -0700
@@ -27,6 +27,8 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "dib3000-common.h"
 #include "dib3000mb_priv.h"
diff -puN drivers/media/dvb/frontends/dib3000mc.c~fix-more-missing-includes drivers/media/dvb/frontends/dib3000mc.c
--- devel/drivers/media/dvb/frontends/dib3000mc.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/dib3000mc.c	2005-10-11 00:34:52.000000000 -0700
@@ -26,6 +26,8 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "dib3000-common.h"
 #include "dib3000mc_priv.h"
diff -puN drivers/media/dvb/frontends/dvb_dummy_fe.c~fix-more-missing-includes drivers/media/dvb/frontends/dvb_dummy_fe.c
--- devel/drivers/media/dvb/frontends/dvb_dummy_fe.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/dvb_dummy_fe.c	2005-10-11 00:34:52.000000000 -0700
@@ -22,6 +22,8 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "dvb_frontend.h"
 #include "dvb_dummy_fe.h"
diff -puN drivers/media/dvb/frontends/lgdt330x.c~fix-more-missing-includes drivers/media/dvb/frontends/lgdt330x.c
--- devel/drivers/media/dvb/frontends/lgdt330x.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/lgdt330x.c	2005-10-11 00:34:52.000000000 -0700
@@ -37,6 +37,8 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 
 #include "dvb_frontend.h"
diff -puN drivers/media/dvb/frontends/mt312.c~fix-more-missing-includes drivers/media/dvb/frontends/mt312.c
--- devel/drivers/media/dvb/frontends/mt312.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/mt312.c	2005-10-11 00:34:52.000000000 -0700
@@ -29,6 +29,8 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "dvb_frontend.h"
 #include "mt312_priv.h"
diff -puN drivers/media/dvb/frontends/mt352.c~fix-more-missing-includes drivers/media/dvb/frontends/mt352.c
--- devel/drivers/media/dvb/frontends/mt352.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/mt352.c	2005-10-11 00:34:52.000000000 -0700
@@ -35,6 +35,8 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "dvb_frontend.h"
 #include "mt352_priv.h"
diff -puN drivers/media/dvb/frontends/nxt2002.c~fix-more-missing-includes drivers/media/dvb/frontends/nxt2002.c
--- devel/drivers/media/dvb/frontends/nxt2002.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/nxt2002.c	2005-10-11 00:34:52.000000000 -0700
@@ -32,6 +32,8 @@
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "dvb_frontend.h"
 #include "nxt2002.h"
diff -puN drivers/media/dvb/frontends/or51132.c~fix-more-missing-includes drivers/media/dvb/frontends/or51132.c
--- devel/drivers/media/dvb/frontends/or51132.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/or51132.c	2005-10-11 00:34:52.000000000 -0700
@@ -36,6 +36,8 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 
 #include "dvb_frontend.h"
diff -puN drivers/media/dvb/frontends/or51211.c~fix-more-missing-includes drivers/media/dvb/frontends/or51211.c
--- devel/drivers/media/dvb/frontends/or51211.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/or51211.c	2005-10-11 00:34:52.000000000 -0700
@@ -34,6 +34,8 @@
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <asm/byteorder.h>
 
 #include "dvb_frontend.h"
diff -puN drivers/media/dvb/frontends/sp8870.c~fix-more-missing-includes drivers/media/dvb/frontends/sp8870.c
--- devel/drivers/media/dvb/frontends/sp8870.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/sp8870.c	2005-10-11 00:34:52.000000000 -0700
@@ -32,6 +32,8 @@
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "dvb_frontend.h"
 #include "sp8870.h"
diff -puN drivers/media/dvb/frontends/sp887x.c~fix-more-missing-includes drivers/media/dvb/frontends/sp887x.c
--- devel/drivers/media/dvb/frontends/sp887x.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/sp887x.c	2005-10-11 00:34:52.000000000 -0700
@@ -14,6 +14,8 @@
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #include "dvb_frontend.h"
 #include "sp887x.h"
diff -puN drivers/media/dvb/frontends/stv0297.c~fix-more-missing-includes drivers/media/dvb/frontends/stv0297.c
--- devel/drivers/media/dvb/frontends/stv0297.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/stv0297.c	2005-10-11 00:34:52.000000000 -0700
@@ -25,6 +25,7 @@
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/jiffies.h>
+#include <linux/slab.h>
 
 #include "dvb_frontend.h"
 #include "stv0297.h"
diff -puN drivers/media/dvb/frontends/tda1004x.c~fix-more-missing-includes drivers/media/dvb/frontends/tda1004x.c
--- devel/drivers/media/dvb/frontends/tda1004x.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/media/dvb/frontends/tda1004x.c	2005-10-11 00:34:52.000000000 -0700
@@ -33,6 +33,9 @@
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/jiffies.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
 #include "dvb_frontend.h"
 #include "tda1004x.h"
 
diff -puN drivers/message/i2o/device.c~fix-more-missing-includes drivers/message/i2o/device.c
--- devel/drivers/message/i2o/device.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/message/i2o/device.c	2005-10-11 00:34:52.000000000 -0700
@@ -16,6 +16,8 @@
 #include <linux/module.h>
 #include <linux/i2o.h>
 #include <linux/delay.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "core.h"
 
 /**
diff -puN drivers/message/i2o/driver.c~fix-more-missing-includes drivers/message/i2o/driver.c
--- devel/drivers/message/i2o/driver.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/message/i2o/driver.c	2005-10-11 00:34:52.000000000 -0700
@@ -17,6 +17,9 @@
 #include <linux/module.h>
 #include <linux/rwsem.h>
 #include <linux/i2o.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "core.h"
 
 #define OSM_NAME	"i2o"
diff -puN drivers/message/i2o/exec-osm.c~fix-more-missing-includes drivers/message/i2o/exec-osm.c
--- devel/drivers/message/i2o/exec-osm.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/message/i2o/exec-osm.c	2005-10-11 00:34:52.000000000 -0700
@@ -30,6 +30,10 @@
 #include <linux/module.h>
 #include <linux/i2o.h>
 #include <linux/delay.h>
+#include <linux/workqueue.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <asm/param.h>		/* HZ */
 #include "core.h"
 
 #define OSM_NAME "exec-osm"
diff -puN drivers/message/i2o/iop.c~fix-more-missing-includes drivers/message/i2o/iop.c
--- devel/drivers/message/i2o/iop.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/message/i2o/iop.c	2005-10-11 00:34:52.000000000 -0700
@@ -28,6 +28,7 @@
 #include <linux/module.h>
 #include <linux/i2o.h>
 #include <linux/delay.h>
+#include <linux/sched.h>
 #include "core.h"
 
 #define OSM_NAME	"i2o"
diff -puN drivers/mtd/chips/jedec.c~fix-more-missing-includes drivers/mtd/chips/jedec.c
--- devel/drivers/mtd/chips/jedec.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/chips/jedec.c	2005-10-11 00:34:52.000000000 -0700
@@ -17,6 +17,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/mtd/jedec.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/mtd.h>
diff -puN drivers/mtd/devices/lart.c~fix-more-missing-includes drivers/mtd/devices/lart.c
--- devel/drivers/mtd/devices/lart.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/devices/lart.c	2005-10-11 00:34:52.000000000 -0700
@@ -44,6 +44,7 @@
 #include <linux/types.h>
 #include <linux/init.h>
 #include <linux/errno.h>
+#include <linux/string.h>
 #include <linux/mtd/mtd.h>
 #ifdef HAVE_PARTITIONS
 #include <linux/mtd/partitions.h>
diff -puN drivers/mtd/devices/phram.c~fix-more-missing-includes drivers/mtd/devices/phram.c
--- devel/drivers/mtd/devices/phram.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/devices/phram.c	2005-10-11 00:34:52.000000000 -0700
@@ -22,6 +22,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 
 #define ERROR(fmt, args...) printk(KERN_ERR "phram: " fmt , ## args)
diff -puN drivers/mtd/maps/bast-flash.c~fix-more-missing-includes drivers/mtd/maps/bast-flash.c
--- devel/drivers/mtd/maps/bast-flash.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/bast-flash.c	2005-10-11 00:34:52.000000000 -0700
@@ -33,6 +33,7 @@
 #include <linux/string.h>
 #include <linux/ioport.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff -puN drivers/mtd/maps/ceiva.c~fix-more-missing-includes drivers/mtd/maps/ceiva.c
--- devel/drivers/mtd/maps/ceiva.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/ceiva.c	2005-10-11 00:34:52.000000000 -0700
@@ -20,6 +20,7 @@
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff -puN drivers/mtd/maps/dc21285.c~fix-more-missing-includes drivers/mtd/maps/dc21285.c
--- devel/drivers/mtd/maps/dc21285.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/dc21285.c	2005-10-11 00:34:52.000000000 -0700
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff -puN drivers/mtd/maps/dilnetpc.c~fix-more-missing-includes drivers/mtd/maps/dilnetpc.c
--- devel/drivers/mtd/maps/dilnetpc.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/dilnetpc.c	2005-10-11 00:34:52.000000000 -0700
@@ -30,12 +30,15 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/string.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/concat.h>
 
+#include <asm/io.h>
+
 /*
 ** The DIL/NetPC keeps its BIOS in two distinct flash blocks.
 ** Destroying any of these blocks transforms the DNPC into
diff -puN drivers/mtd/maps/epxa10db-flash.c~fix-more-missing-includes drivers/mtd/maps/epxa10db-flash.c
--- devel/drivers/mtd/maps/epxa10db-flash.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/epxa10db-flash.c	2005-10-11 00:34:52.000000000 -0700
@@ -27,12 +27,15 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/slab.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 
+#include <asm/io.h>
 #include <asm/hardware.h>
+
 #ifdef CONFIG_EPXA10DB
 #define BOARD_NAME "EPXA10DB"
 #else
diff -puN drivers/mtd/maps/fortunet.c~fix-more-missing-includes drivers/mtd/maps/fortunet.c
--- devel/drivers/mtd/maps/fortunet.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/fortunet.c	2005-10-11 00:34:52.000000000 -0700
@@ -7,11 +7,14 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/string.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 
+#include <asm/io.h>
+
 #define MAX_NUM_REGIONS		4
 #define MAX_NUM_PARTITIONS	8
 
diff -puN drivers/mtd/maps/ixp2000.c~fix-more-missing-includes drivers/mtd/maps/ixp2000.c
--- devel/drivers/mtd/maps/ixp2000.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/ixp2000.c	2005-10-11 00:34:52.000000000 -0700
@@ -22,11 +22,13 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
-#include <linux/ioport.h>
-#include <linux/device.h>
 
 #include <asm/io.h>
 #include <asm/hardware.h>
diff -puN drivers/mtd/maps/ixp4xx.c~fix-more-missing-includes drivers/mtd/maps/ixp4xx.c
--- devel/drivers/mtd/maps/ixp4xx.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/ixp4xx.c	2005-10-11 00:34:52.000000000 -0700
@@ -20,11 +20,14 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/ioport.h>
+#include <linux/device.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
-#include <linux/ioport.h>
-#include <linux/device.h>
+
 #include <asm/io.h>
 #include <asm/mach/flash.h>
 
diff -puN drivers/mtd/maps/lubbock-flash.c~fix-more-missing-includes drivers/mtd/maps/lubbock-flash.c
--- devel/drivers/mtd/maps/lubbock-flash.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/lubbock-flash.c	2005-10-11 00:34:52.000000000 -0700
@@ -15,10 +15,13 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/slab.h>
+
 #include <linux/dma-mapping.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+
 #include <asm/io.h>
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
diff -puN drivers/mtd/maps/mainstone-flash.c~fix-more-missing-includes drivers/mtd/maps/mainstone-flash.c
--- devel/drivers/mtd/maps/mainstone-flash.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/mainstone-flash.c	2005-10-11 00:34:52.000000000 -0700
@@ -16,9 +16,12 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
+#include <linux/slab.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+
 #include <asm/io.h>
 #include <asm/hardware.h>
 #include <asm/arch/pxa-regs.h>
diff -puN drivers/mtd/maps/omap_nor.c~fix-more-missing-includes drivers/mtd/maps/omap_nor.c
--- devel/drivers/mtd/maps/omap_nor.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/omap_nor.c	2005-10-11 00:34:52.000000000 -0700
@@ -36,6 +36,8 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
+#include <linux/slab.h>
+
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
diff -puN drivers/mtd/maps/omap-toto-flash.c~fix-more-missing-includes drivers/mtd/maps/omap-toto-flash.c
--- devel/drivers/mtd/maps/omap-toto-flash.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/omap-toto-flash.c	2005-10-11 00:34:52.000000000 -0700
@@ -12,9 +12,9 @@
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
-
 #include <linux/errno.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff -puN drivers/mtd/maps/pci.c~fix-more-missing-includes drivers/mtd/maps/pci.c
--- devel/drivers/mtd/maps/pci.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/pci.c	2005-10-11 00:34:52.000000000 -0700
@@ -17,6 +17,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff -puN drivers/mtd/maps/plat-ram.c~fix-more-missing-includes drivers/mtd/maps/plat-ram.c
--- devel/drivers/mtd/maps/plat-ram.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/plat-ram.c	2005-10-11 00:34:52.000000000 -0700
@@ -30,6 +30,7 @@
 #include <linux/string.h>
 #include <linux/ioport.h>
 #include <linux/device.h>
+#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff -puN drivers/mtd/maps/tqm8xxl.c~fix-more-missing-includes drivers/mtd/maps/tqm8xxl.c
--- devel/drivers/mtd/maps/tqm8xxl.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/maps/tqm8xxl.c	2005-10-11 00:34:52.000000000 -0700
@@ -27,12 +27,14 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/io.h>
+#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
 
+#include <asm/io.h>
+
 #define FLASH_ADDR 0x40000000
 #define FLASH_SIZE 0x00800000
 #define FLASH_BANK_MAX 4
diff -puN drivers/mtd/nand/s3c2410.c~fix-more-missing-includes drivers/mtd/nand/s3c2410.c
--- devel/drivers/mtd/nand/s3c2410.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/mtd/nand/s3c2410.c	2005-10-11 00:34:52.000000000 -0700
@@ -51,6 +51,7 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>
diff -puN drivers/pci/hotplug/cpcihp_generic.c~fix-more-missing-includes drivers/pci/hotplug/cpcihp_generic.c
--- devel/drivers/pci/hotplug/cpcihp_generic.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/cpcihp_generic.c	2005-10-11 00:34:52.000000000 -0700
@@ -39,6 +39,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
+#include <linux/string.h>
 #include "cpci_hotplug.h"
 
 #define DRIVER_VERSION	"0.1"
diff -puN drivers/pci/hotplug/cpcihp_zt5550.c~fix-more-missing-includes drivers/pci/hotplug/cpcihp_zt5550.c
--- devel/drivers/pci/hotplug/cpcihp_zt5550.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/cpcihp_zt5550.c	2005-10-11 00:34:52.000000000 -0700
@@ -36,6 +36,7 @@
 #include <linux/init.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
+#include <linux/signal.h>	/* SA_SHIRQ */
 #include "cpci_hotplug.h"
 #include "cpcihp_zt5550.h"
 
diff -puN drivers/pci/hotplug/fakephp.c~fix-more-missing-includes drivers/pci/hotplug/fakephp.c
--- devel/drivers/pci/hotplug/fakephp.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/fakephp.c	2005-10-11 00:34:52.000000000 -0700
@@ -37,6 +37,8 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/init.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "pci_hotplug.h"
 #include "../pci.h"
 
diff -puN drivers/pci/hotplug/rpadlpar_core.c~fix-more-missing-includes drivers/pci/hotplug/rpadlpar_core.c
--- devel/drivers/pci/hotplug/rpadlpar_core.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/rpadlpar_core.c	2005-10-11 00:34:52.000000000 -0700
@@ -16,10 +16,13 @@
  */
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/string.h>
+
 #include <asm/pci-bridge.h>
 #include <asm/semaphore.h>
 #include <asm/rtas.h>
 #include <asm/vio.h>
+
 #include "../pci.h"
 #include "rpaphp.h"
 #include "rpadlpar.h"
diff -puN drivers/pci/hotplug/rpaphp_pci.c~fix-more-missing-includes drivers/pci/hotplug/rpaphp_pci.c
--- devel/drivers/pci/hotplug/rpaphp_pci.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/rpaphp_pci.c	2005-10-11 00:34:52.000000000 -0700
@@ -23,11 +23,13 @@
  *
  */
 #include <linux/pci.h>
+#include <linux/string.h>
+
 #include <asm/pci-bridge.h>
 #include <asm/rtas.h>
 #include <asm/machdep.h>
-#include "../pci.h"		/* for pci_add_new_bus */
 
+#include "../pci.h"		/* for pci_add_new_bus */
 #include "rpaphp.h"
 
 static struct pci_bus *find_bus_among_children(struct pci_bus *bus,
diff -puN drivers/pci/hotplug/rpaphp_slot.c~fix-more-missing-includes drivers/pci/hotplug/rpaphp_slot.c
--- devel/drivers/pci/hotplug/rpaphp_slot.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/hotplug/rpaphp_slot.c	2005-10-11 00:34:52.000000000 -0700
@@ -27,6 +27,9 @@
 #include <linux/kobject.h>
 #include <linux/sysfs.h>
 #include <linux/pci.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
 #include <asm/rtas.h>
 #include "rpaphp.h"
 
diff -puN drivers/pci/pci.c~fix-more-missing-includes drivers/pci/pci.c
--- devel/drivers/pci/pci.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/pci.c	2005-10-11 00:34:52.000000000 -0700
@@ -15,6 +15,7 @@
 #include <linux/pci.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
+#include <linux/string.h>
 #include <asm/dma.h>	/* isa_dma_bridge_buggy */
 #include "pci.h"
 
diff -puN drivers/pci/pci-driver.c~fix-more-missing-includes drivers/pci/pci-driver.c
--- devel/drivers/pci/pci-driver.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/pci-driver.c	2005-10-11 00:34:52.000000000 -0700
@@ -8,6 +8,8 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/mempolicy.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include "pci.h"
 
 /*
diff -puN drivers/pci/pcie/portdrv_core.c~fix-more-missing-includes drivers/pci/pcie/portdrv_core.c
--- devel/drivers/pci/pcie/portdrv_core.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/pcie/portdrv_core.c	2005-10-11 00:34:52.000000000 -0700
@@ -11,6 +11,8 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/pm.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/pcieport_if.h>
 
 #include "portdrv.h"
diff -puN drivers/pci/pcie/portdrv_pci.c~fix-more-missing-includes drivers/pci/pcie/portdrv_pci.c
--- devel/drivers/pci/pcie/portdrv_pci.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/pcie/portdrv_pci.c	2005-10-11 00:34:52.000000000 -0700
@@ -12,6 +12,7 @@
 #include <linux/errno.h>
 #include <linux/pm.h>
 #include <linux/init.h>
+#include <linux/slab.h>
 #include <linux/pcieport_if.h>
 
 #include "portdrv.h"
diff -puN drivers/pci/rom.c~fix-more-missing-includes drivers/pci/rom.c
--- devel/drivers/pci/rom.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pci/rom.c	2005-10-11 00:34:52.000000000 -0700
@@ -9,6 +9,7 @@
 #include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/slab.h>
 
 #include "pci.h"
 
diff -puN drivers/pnp/manager.c~fix-more-missing-includes drivers/pnp/manager.c
--- devel/drivers/pnp/manager.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pnp/manager.c	2005-10-11 00:34:52.000000000 -0700
@@ -12,6 +12,8 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/pnp.h>
+#include <linux/slab.h>
+#include <linux/bitmap.h>
 #include "base.h"
 
 DECLARE_MUTEX(pnp_res_mutex);
diff -puN drivers/pnp/pnpbios/rsparser.c~fix-more-missing-includes drivers/pnp/pnpbios/rsparser.c
--- devel/drivers/pnp/pnpbios/rsparser.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/pnp/pnpbios/rsparser.c	2005-10-11 00:34:52.000000000 -0700
@@ -7,6 +7,8 @@
 #include <linux/ctype.h>
 #include <linux/pnp.h>
 #include <linux/pnpbios.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 #ifdef CONFIG_PCI
 #include <linux/pci.h>
diff -puN drivers/s390/cio/cmf.c~fix-more-missing-includes drivers/s390/cio/cmf.c
--- devel/drivers/s390/cio/cmf.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/s390/cio/cmf.c	2005-10-11 00:34:52.000000000 -0700
@@ -30,10 +30,13 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/slab.h>
+#include <linux/timex.h>	/* get_clock() */
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
 #include <asm/cmb.h>
+#include <asm/div64.h>
 
 #include "cio.h"
 #include "css.h"
diff -puN drivers/s390/cio/device.c~fix-more-missing-includes drivers/s390/cio/device.c
--- devel/drivers/s390/cio/device.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/s390/cio/device.c	2005-10-11 00:34:52.000000000 -0700
@@ -22,6 +22,7 @@
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
+#include <asm/param.h>		/* HZ */
 
 #include "cio.h"
 #include "css.h"
diff -puN drivers/s390/cio/device_fsm.c~fix-more-missing-includes drivers/s390/cio/device_fsm.c
--- devel/drivers/s390/cio/device_fsm.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/s390/cio/device_fsm.c	2005-10-11 00:34:52.000000000 -0700
@@ -11,6 +11,8 @@
 #include <linux/module.h>
 #include <linux/config.h>
 #include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/string.h>
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
diff -puN drivers/scsi/scsi_transport_iscsi.c~fix-more-missing-includes drivers/scsi/scsi_transport_iscsi.c
--- devel/drivers/scsi/scsi_transport_iscsi.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/scsi/scsi_transport_iscsi.c	2005-10-11 00:34:52.000000000 -0700
@@ -22,7 +22,11 @@
  */
 #include <linux/module.h>
 #include <linux/mempool.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+
 #include <net/tcp.h>
+
 #include <scsi/scsi.h>
 #include <scsi/scsi_host.h>
 #include <scsi/scsi_device.h>
diff -puN drivers/scsi/sym53c8xx_2/sym_hipd.c~fix-more-missing-includes drivers/scsi/sym53c8xx_2/sym_hipd.c
--- devel/drivers/scsi/sym53c8xx_2/sym_hipd.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/scsi/sym53c8xx_2/sym_hipd.c	2005-10-11 00:34:52.000000000 -0700
@@ -37,6 +37,9 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
+#include <linux/slab.h>
+
 #include "sym_glue.h"
 #include "sym_nvram.h"
 
diff -puN drivers/scsi/sym53c8xx_2/sym_hipd.h~fix-more-missing-includes drivers/scsi/sym53c8xx_2/sym_hipd.h
--- devel/drivers/scsi/sym53c8xx_2/sym_hipd.h~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/scsi/sym53c8xx_2/sym_hipd.h	2005-10-11 00:34:52.000000000 -0700
@@ -37,6 +37,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <linux/gfp.h>
+
 #ifndef SYM_HIPD_H
 #define SYM_HIPD_H
 
diff -puN drivers/sh/superhyway/superhyway.c~fix-more-missing-includes drivers/sh/superhyway/superhyway.c
--- devel/drivers/sh/superhyway/superhyway.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/sh/superhyway/superhyway.c	2005-10-11 00:34:52.000000000 -0700
@@ -16,6 +16,8 @@
 #include <linux/types.h>
 #include <linux/list.h>
 #include <linux/superhyway.h>
+#include <linux/string.h>
+#include <linux/slab.h>
 
 static int superhyway_devices;
 
diff -puN drivers/usb/host/ohci-omap.c~fix-more-missing-includes drivers/usb/host/ohci-omap.c
--- devel/drivers/usb/host/ohci-omap.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/usb/host/ohci-omap.c	2005-10-11 00:34:52.000000000 -0700
@@ -14,6 +14,9 @@
  * This file is licenced under the GPL.
  */
 
+#include <linux/signal.h>	/* SA_INTERRUPT */
+#include <linux/jiffies.h>
+
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
diff -puN drivers/zorro/zorro.c~fix-more-missing-includes drivers/zorro/zorro.c
--- devel/drivers/zorro/zorro.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/zorro/zorro.c	2005-10-11 00:34:52.000000000 -0700
@@ -16,6 +16,8 @@
 #include <linux/init.h>
 #include <linux/zorro.h>
 #include <linux/bitops.h>
+#include <linux/string.h>
+
 #include <asm/setup.h>
 #include <asm/amigahw.h>
 
diff -puN drivers/zorro/zorro-sysfs.c~fix-more-missing-includes drivers/zorro/zorro-sysfs.c
--- devel/drivers/zorro/zorro-sysfs.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/drivers/zorro/zorro-sysfs.c	2005-10-11 00:34:52.000000000 -0700
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/zorro.h>
 #include <linux/stat.h>
+#include <linux/string.h>
 
 #include "zorro.h"
 
diff -puN include/linux/i2o.h~fix-more-missing-includes include/linux/i2o.h
--- devel/include/linux/i2o.h~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/include/linux/i2o.h	2005-10-11 00:34:52.000000000 -0700
@@ -25,10 +25,14 @@
 /* How many different OSM's are we allowing */
 #define I2O_MAX_DRIVERS		8
 
-#include <asm/io.h>
-#include <asm/semaphore.h>	/* Needed for MUTEX init macros */
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
+#include <linux/string.h>
+#include <linux/slab.h>
+#include <linux/workqueue.h>	/* work_struct */
+
+#include <asm/io.h>
+#include <asm/semaphore.h>	/* Needed for MUTEX init macros */
 
 /* message queue empty */
 #define I2O_QUEUE_EMPTY		0xffffffff
diff -puN include/linux/mtd/map.h~fix-more-missing-includes include/linux/mtd/map.h
--- devel/include/linux/mtd/map.h~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/include/linux/mtd/map.h	2005-10-11 00:34:52.000000000 -0700
@@ -8,7 +8,10 @@
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/list.h>
+#include <linux/string.h>
+
 #include <linux/mtd/compatmac.h>
+
 #include <asm/unaligned.h>
 #include <asm/system.h>
 #include <asm/io.h>
diff -puN include/linux/textsearch.h~fix-more-missing-includes include/linux/textsearch.h
--- devel/include/linux/textsearch.h~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/include/linux/textsearch.h	2005-10-11 00:34:52.000000000 -0700
@@ -8,6 +8,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 
 struct ts_config;
 
diff -puN kernel/params.c~fix-more-missing-includes kernel/params.c
--- devel/kernel/params.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/kernel/params.c	2005-10-11 00:34:52.000000000 -0700
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/err.h>
+#include <linux/slab.h>
 
 #if 0
 #define DEBUGP printk
diff -puN lib/kobject.c~fix-more-missing-includes lib/kobject.c
--- devel/lib/kobject.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/lib/kobject.c	2005-10-11 00:34:52.000000000 -0700
@@ -14,6 +14,7 @@
 #include <linux/string.h>
 #include <linux/module.h>
 #include <linux/stat.h>
+#include <linux/slab.h>
 
 /**
  *	populate_dir - populate directory with attributes.
diff -puN lib/sort.c~fix-more-missing-includes lib/sort.c
--- devel/lib/sort.c~fix-more-missing-includes	2005-10-11 00:34:52.000000000 -0700
+++ devel-akpm/lib/sort.c	2005-10-11 00:34:52.000000000 -0700
@@ -7,6 +7,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sort.h>
+#include <linux/slab.h>
 
 static void u32_swap(void *a, void *b, int size)
 {
_