Merge remote-tracking branch 'moduleh/module.h-split'

Conflicts:
	sound/i2c/other/tea575x-tuner.c

diff --cc arch/arm/kernel/bios32.c
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/mips/kernel/traps.c
Simple merge

diff --cc arch/sparc/kernel/cpu.c
Simple merge

diff --cc arch/sparc/kernel/cpumap.c
Simple merge

diff --cc arch/sparc/kernel/hvapi.c
Simple merge

diff --cc arch/sparc/kernel/leon_pci_grpci2.c
Simple merge

diff --cc arch/sparc/kernel/pcr.c
Simple merge

diff --cc drivers/acpi/ec_sys.c
Simple merge

diff --cc drivers/acpi/sysfs.c
Simple merge

diff --cc drivers/dma/intel_mid_dma.c
Simple merge

diff --cc drivers/input/keyboard/tnetv107x-keypad.c
Simple merge

diff --cc drivers/input/touchscreen/ads7846.c
Simple merge

diff --cc drivers/md/dm-log-userspace-base.c
Simple merge

diff --cc drivers/md/dm-raid.c
index a002dd85db1e674e2efbc188a531f001c2d0716b,a07560ec4313c16de5ca76c10ea1a271cf70eb7d..8f6a8f832e8f744b7ba279bf1aa2c073f22caff1
--- 1/drivers/md/dm-raid.c
--- 2/drivers/md/dm-raid.c
+++ b/drivers/md/dm-raid.c
@@@ -6,14 -6,13 +6,15 @@@
   */
  
  #include <linux/slab.h>
+ #include <linux/module.h>
  
  #include "md.h"
 +#include "raid1.h"
  #include "raid5.h"
 -#include "dm.h"
  #include "bitmap.h"
  
 +#include <linux/device-mapper.h>
 +
  #define DM_MSG_PREFIX "raid"
  
  /*

diff --cc drivers/md/dm-snap-persistent.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/md/raid1.c
index 32323f0afd8954714401cb8ed8c5b455b32a9743,c177f46469d930634db883ef8fa87f44ac7aa5a5..56db3230c674343b7951a6f14a892dd1465c4a65
--- 1/drivers/md/raid1.c
--- 2/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@@ -34,8 -34,8 +34,9 @@@
  #include <linux/slab.h>
  #include <linux/delay.h>
  #include <linux/blkdev.h>
+ #include <linux/module.h>
  #include <linux/seq_file.h>
 +#include <linux/ratelimit.h>
  #include "md.h"
  #include "raid1.h"
  #include "bitmap.h"

diff --cc drivers/md/raid10.c
index 8b29cd4f01c89f8213d7dcc43cd1aaf6dd5799c7,7295fdb61fb8d5039bfdea1b18a8c08d4350d298..d2fd2122410e029cd04732694b0de0310ef1a4c3
--- 1/drivers/md/raid10.c
--- 2/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@@ -21,8 -21,8 +21,9 @@@
  #include <linux/slab.h>
  #include <linux/delay.h>
  #include <linux/blkdev.h>
+ #include <linux/module.h>
  #include <linux/seq_file.h>
 +#include <linux/ratelimit.h>
  #include "md.h"
  #include "raid10.h"
  #include "raid0.h"

diff --cc drivers/md/raid5.c
Simple merge

diff --cc drivers/media/common/tuners/tuner-types.c
Simple merge

diff --cc drivers/media/radio/radio-timb.c
Simple merge

diff --cc drivers/media/radio/radio-wl1273.c
Simple merge

diff --cc drivers/media/radio/wl128x/fmdrv_v4l2.c
Simple merge

diff --cc drivers/media/rc/ir-lirc-codec.c
Simple merge

diff --cc drivers/media/rc/ir-raw.c
Simple merge

diff --cc drivers/media/rc/keymaps/rc-rc6-mce.c
Simple merge

diff --cc drivers/media/rc/rc-main.c
Simple merge

diff --cc drivers/media/video/m5mols/m5mols_core.c
Simple merge

diff --cc drivers/media/video/mt9m001.c
Simple merge

diff --cc drivers/media/video/mt9m111.c
Simple merge

diff --cc drivers/media/video/mt9t031.c
Simple merge

diff --cc drivers/media/video/mt9v011.c
Simple merge

diff --cc drivers/media/video/mt9v022.c
Simple merge

diff --cc drivers/media/video/mt9v032.c
Simple merge

diff --cc drivers/media/video/omap24xxcam.c
Simple merge

diff --cc drivers/media/video/pvrusb2/pvrusb2-v4l2.c
Simple merge

diff --cc drivers/media/video/rj54n1cb0c.c
Simple merge

diff --cc drivers/media/video/sh_mobile_csi2.c
index 2893a0134c7e081ba68e5fbe53d9598465a4d287,052b8971300e43ecef8ef29f6218de36d1d28660..426c8adef28a7a64c1839cf031da98711a237c42
--- 1/drivers/media/video/sh_mobile_csi2.c
--- 2/drivers/media/video/sh_mobile_csi2.c
+++ b/drivers/media/video/sh_mobile_csi2.c
@@@ -15,8 -15,8 +15,9 @@@
  #include <linux/pm_runtime.h>
  #include <linux/slab.h>
  #include <linux/videodev2.h>
+ #include <linux/module.h>
  
 +#include <media/sh_mobile_ceu.h>
  #include <media/sh_mobile_csi2.h>
  #include <media/soc_camera.h>
  #include <media/v4l2-common.h>

diff --cc drivers/media/video/sh_vou.c
index 6a729879d89e66b684d675839aa0fdf1b2c923ce,3fa73a0879fa99fec7ed29e37f79e6a45e16fcf0..9644bd861abc97290560a09f569bdf420578cfcd
--- 1/drivers/media/video/sh_vou.c
--- 2/drivers/media/video/sh_vou.c
+++ b/drivers/media/video/sh_vou.c
@@@ -19,7 -19,9 +19,8 @@@
  #include <linux/platform_device.h>
  #include <linux/pm_runtime.h>
  #include <linux/slab.h>
 -#include <linux/version.h>
  #include <linux/videodev2.h>
+ #include <linux/module.h>
  
  #include <media/sh_vou.h>
  #include <media/v4l2-common.h>

diff --cc drivers/media/video/sr030pc30.c
Simple merge

diff --cc drivers/media/video/timblogiw.c
Simple merge

diff --cc drivers/media/video/v4l2-ctrls.c
Simple merge

diff --cc drivers/media/video/v4l2-device.c
Simple merge

diff --cc drivers/media/video/v4l2-event.c
index 53b190cf225e734e71a0ddaacfa1c66b69644b67,4246f221b6e42048cb6d882342b989babae86ad7..46037f225529d2e35a6eb0fb15c87368ac8dd54d
--- 1/drivers/media/video/v4l2-event.c
--- 2/drivers/media/video/v4l2-event.c
+++ b/drivers/media/video/v4l2-event.c
@@@ -29,12 -28,76 +29,13 @@@
  
  #include <linux/sched.h>
  #include <linux/slab.h>
+ #include <linux/export.h>
  
 -int v4l2_event_init(struct v4l2_fh *fh)
 +static unsigned sev_pos(const struct v4l2_subscribed_event *sev, unsigned idx)
  {
 -      fh->events = kzalloc(sizeof(*fh->events), GFP_KERNEL);
 -      if (fh->events == NULL)
 -              return -ENOMEM;
 -
 -      init_waitqueue_head(&fh->events->wait);
 -
 -      INIT_LIST_HEAD(&fh->events->free);
 -      INIT_LIST_HEAD(&fh->events->available);
 -      INIT_LIST_HEAD(&fh->events->subscribed);
 -
 -      fh->events->sequence = -1;
 -
 -      return 0;
 -}
 -EXPORT_SYMBOL_GPL(v4l2_event_init);
 -
 -int v4l2_event_alloc(struct v4l2_fh *fh, unsigned int n)
 -{
 -      struct v4l2_events *events = fh->events;
 -      unsigned long flags;
 -
 -      if (!events) {
 -              WARN_ON(1);
 -              return -ENOMEM;
 -      }
 -
 -      while (events->nallocated < n) {
 -              struct v4l2_kevent *kev;
 -
 -              kev = kzalloc(sizeof(*kev), GFP_KERNEL);
 -              if (kev == NULL)
 -                      return -ENOMEM;
 -
 -              spin_lock_irqsave(&fh->vdev->fh_lock, flags);
 -              list_add_tail(&kev->list, &events->free);
 -              events->nallocated++;
 -              spin_unlock_irqrestore(&fh->vdev->fh_lock, flags);
 -      }
 -
 -      return 0;
 -}
 -EXPORT_SYMBOL_GPL(v4l2_event_alloc);
 -
 -#define list_kfree(list, type, member)                                \
 -      while (!list_empty(list)) {                             \
 -              type *hi;                                       \
 -              hi = list_first_entry(list, type, member);      \
 -              list_del(&hi->member);                          \
 -              kfree(hi);                                      \
 -      }
 -
 -void v4l2_event_free(struct v4l2_fh *fh)
 -{
 -      struct v4l2_events *events = fh->events;
 -
 -      if (!events)
 -              return;
 -
 -      list_kfree(&events->free, struct v4l2_kevent, list);
 -      list_kfree(&events->available, struct v4l2_kevent, list);
 -      list_kfree(&events->subscribed, struct v4l2_subscribed_event, list);
 -
 -      kfree(events);
 -      fh->events = NULL;
 +      idx += sev->first;
 +      return idx >= sev->elems ? idx - sev->elems : idx;
  }
 -EXPORT_SYMBOL_GPL(v4l2_event_free);
  
  static int __v4l2_event_dequeue(struct v4l2_fh *fh, struct v4l2_event *event)
  {

diff --cc drivers/media/video/v4l2-fh.c
Simple merge

diff --cc drivers/media/video/v4l2-subdev.c
Simple merge

diff --cc drivers/mfd/ab3550-core.c
Simple merge

diff --cc drivers/mfd/ab8500-debugfs.c
Simple merge

diff --cc drivers/mfd/twl-core.c
Simple merge

diff --cc drivers/mmc/card/mmc_test.c
Simple merge

diff --cc drivers/mmc/core/host.c
Simple merge

diff --cc drivers/mmc/core/mmc.c
Simple merge

diff --cc drivers/mmc/host/sdhci.c
Simple merge

diff --cc drivers/mtd/ar7part.c
Simple merge

diff --cc drivers/mtd/cmdlinepart.c
Simple merge

diff --cc drivers/mtd/mtdsuper.c
Simple merge

diff --cc drivers/mtd/nand/cafe_nand.c
Simple merge

diff --cc drivers/mtd/nand/diskonchip.c
Simple merge

diff --cc drivers/mtd/nand/nand_bbt.c
Simple merge

diff --cc drivers/mtd/onenand/onenand_bbt.c
Simple merge

diff --cc drivers/mtd/redboot.c
Simple merge

diff --cc drivers/pci/setup-res.c
Simple merge

diff --cc drivers/platform/x86/intel_scu_ipc.c
Simple merge

diff --cc drivers/platform/x86/msi-wmi.c
Simple merge

diff --cc drivers/power/max17042_battery.c
index 98bfab35b8e99ab4c020e9dad91b8f6475b79ac2,0814aff8d26ff6e55c397d62859c8c92baa20a3d..6db971055eb432b05c664aae1e2cca45e80c40aa
--- 1/drivers/power/max17042_battery.c
--- 2/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@@ -28,7 -28,76 +28,8 @@@
  #include <linux/mod_devicetable.h>
  #include <linux/power_supply.h>
  #include <linux/power/max17042_battery.h>
+ #include <linux/module.h>
  
 -enum max17042_register {
 -      MAX17042_STATUS         = 0x00,
 -      MAX17042_VALRT_Th       = 0x01,
 -      MAX17042_TALRT_Th       = 0x02,
 -      MAX17042_SALRT_Th       = 0x03,
 -      MAX17042_AtRate         = 0x04,
 -      MAX17042_RepCap         = 0x05,
 -      MAX17042_RepSOC         = 0x06,
 -      MAX17042_Age            = 0x07,
 -      MAX17042_TEMP           = 0x08,
 -      MAX17042_VCELL          = 0x09,
 -      MAX17042_Current        = 0x0A,
 -      MAX17042_AvgCurrent     = 0x0B,
 -      MAX17042_Qresidual      = 0x0C,
 -      MAX17042_SOC            = 0x0D,
 -      MAX17042_AvSOC          = 0x0E,
 -      MAX17042_RemCap         = 0x0F,
 -      MAX17402_FullCAP        = 0x10,
 -      MAX17042_TTE            = 0x11,
 -      MAX17042_V_empty        = 0x12,
 -
 -      MAX17042_RSLOW          = 0x14,
 -
 -      MAX17042_AvgTA          = 0x16,
 -      MAX17042_Cycles         = 0x17,
 -      MAX17042_DesignCap      = 0x18,
 -      MAX17042_AvgVCELL       = 0x19,
 -      MAX17042_MinMaxTemp     = 0x1A,
 -      MAX17042_MinMaxVolt     = 0x1B,
 -      MAX17042_MinMaxCurr     = 0x1C,
 -      MAX17042_CONFIG         = 0x1D,
 -      MAX17042_ICHGTerm       = 0x1E,
 -      MAX17042_AvCap          = 0x1F,
 -      MAX17042_ManName        = 0x20,
 -      MAX17042_DevName        = 0x21,
 -      MAX17042_DevChem        = 0x22,
 -
 -      MAX17042_TempNom        = 0x24,
 -      MAX17042_TempCold       = 0x25,
 -      MAX17042_TempHot        = 0x26,
 -      MAX17042_AIN            = 0x27,
 -      MAX17042_LearnCFG       = 0x28,
 -      MAX17042_SHFTCFG        = 0x29,
 -      MAX17042_RelaxCFG       = 0x2A,
 -      MAX17042_MiscCFG        = 0x2B,
 -      MAX17042_TGAIN          = 0x2C,
 -      MAx17042_TOFF           = 0x2D,
 -      MAX17042_CGAIN          = 0x2E,
 -      MAX17042_COFF           = 0x2F,
 -
 -      MAX17042_Q_empty        = 0x33,
 -      MAX17042_T_empty        = 0x34,
 -
 -      MAX17042_RCOMP0         = 0x38,
 -      MAX17042_TempCo         = 0x39,
 -      MAX17042_Rx             = 0x3A,
 -      MAX17042_T_empty0       = 0x3B,
 -      MAX17042_TaskPeriod     = 0x3C,
 -      MAX17042_FSTAT          = 0x3D,
 -
 -      MAX17042_SHDNTIMER      = 0x3F,
 -
 -      MAX17042_VFRemCap       = 0x4A,
 -
 -      MAX17042_QH             = 0x4D,
 -      MAX17042_QL             = 0x4E,
 -};
 -
  struct max17042_chip {
        struct i2c_client *client;
        struct power_supply battery;

diff --cc drivers/power/max8903_charger.c
index a9b0209a2f55042a572fc18b2d34b2cee979ad78,d26e8281217b25dba2d9fa27cc787ea7e817c6f4..e7fa391c18e3d2e888ffa4f73db15e8f94428b6b
--- 1/drivers/power/max8903_charger.c
--- 2/drivers/power/max8903_charger.c
+++ b/drivers/power/max8903_charger.c
@@@ -26,9 -26,10 +26,10 @@@
  #include <linux/power_supply.h>
  #include <linux/platform_device.h>
  #include <linux/power/max8903_charger.h>
+ #include <linux/module.h>
  
  struct max8903_data {
 -      struct max8903_pdata *pdata;
 +      struct max8903_pdata pdata;
        struct device *dev;
        struct power_supply psy;
        bool fault;

diff --cc drivers/regulator/dummy.c
Simple merge

diff --cc drivers/scsi/bfa/bfad_im.c
Simple merge

diff --cc drivers/scsi/device_handler/scsi_dh_rdac.c
Simple merge

diff --cc drivers/scsi/libfc/fc_exch.c
Simple merge

diff --cc drivers/scsi/libfc/fc_lport.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_attr.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_debugfs.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_scsi.c
Simple merge

diff --cc drivers/scsi/scsi_lib.c
Simple merge

diff --cc drivers/video/carminefb.c
Simple merge

diff --cc drivers/video/mb862xx/mb862xxfbdrv.c
Simple merge

diff --cc drivers/xen/xen-selfballoon.c
index 1b4afd81f872306bb4f5ffd9b860fb5f3c0adc6f,dee7cf335cd74c82d0821c30c0c6cac9e9bc8695..3d87f0462fb565e4a9244305452ef90e1105b480
--- 1/drivers/xen/xen-selfballoon.c
--- 2/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@@ -69,11 -69,13 +69,13 @@@
  
  #include <linux/kernel.h>
  #include <linux/mm.h>
+ #include <linux/stat.h>
+ #include <linux/module.h>
  #include <linux/mman.h>
 -
 +#include <linux/workqueue.h>
  #include <xen/balloon.h>
 -
  #include <xen/tmem.h>
 +#include <xen/xen.h>
  
  /* Enable/disable with sysfs. */
  static int xen_selfballooning_enabled __read_mostly;

diff --cc fs/gfs2/ops_fstype.c
Simple merge

diff --cc include/linux/mtd/mtd.h
Simple merge

diff --cc include/linux/regulator/driver.h
Simple merge

diff --cc kernel/compat.c
Simple merge

diff --cc kernel/resource.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc mm/memory-failure.c
Simple merge

diff --cc mm/swapfile.c
Simple merge

diff --cc sound/i2c/other/tea575x-tuner.c
index 484a35b3715f6142a5d806c6b798651a71b789fd,c65c6245eb051f8cf71013a1520ecebba999a097..eff1f0d4e2d8ae262e079f925d99c5d1f071a261
--- 1/sound/i2c/other/tea575x-tuner.c
--- 2/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@@ -25,8 -25,9 +25,9 @@@
  #include <linux/init.h>
  #include <linux/slab.h>
  #include <linux/version.h>
 -#include <sound/core.h>
+ #include <linux/module.h>
 +#include <media/v4l2-dev.h>
 +#include <media/v4l2-ioctl.h>
  #include <sound/tea575x-tuner.h>
  
  MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");

diff --cc sound/pci/asihpi/hpioctl.c
Simple merge