From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 04:45:27 +0000 (+1000)
Subject: Merge remote-tracking branch 'moduleh/module.h-split'
X-Git-Tag: next-20110729~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eaa427a9d5f447c73da19bed31886b6ac1d7342d;p=karo-tx-linux.git

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

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

eaa427a9d5f447c73da19bed31886b6ac1d7342d
diff --cc drivers/md/dm-raid.c
index a002dd85db1e,a07560ec4313..8f6a8f832e8f
--- a/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/raid1.c
index 32323f0afd89,c177f46469d9..56db3230c674
--- a/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 8b29cd4f01c8,7295fdb61fb8..d2fd2122410e
--- a/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/media/video/sh_mobile_csi2.c
index 2893a0134c7e,052b8971300e..426c8adef28a
--- a/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 6a729879d89e,3fa73a0879fa..9644bd861abc
--- a/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/v4l2-event.c
index 53b190cf225e,4246f221b6e4..46037f225529
--- a/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/power/max17042_battery.c
index 98bfab35b8e9,0814aff8d26f..6db971055eb4
--- a/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 a9b0209a2f55,d26e8281217b..e7fa391c18e3
--- a/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/xen/xen-selfballoon.c
index 1b4afd81f872,dee7cf335cd7..3d87f0462fb5
--- a/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 sound/i2c/other/tea575x-tuner.c
index 484a35b3715f,c65c6245eb05..eff1f0d4e2d8
--- a/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 <linux/module.h>
 -#include <sound/core.h>
 +#include <media/v4l2-dev.h>
 +#include <media/v4l2-ioctl.h>
  #include <sound/tea575x-tuner.h>
  
  MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");