Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...

Pull <linux/device.h> avoidance patches from Paul Gortmaker:
 "Nearly every subsystem has some kind of header with a proto like:

	void foo(struct device *dev);

  and yet there is no reason for most of these guys to care about the
  sub fields within the device struct.  This allows us to significantly
  reduce the scope of headers including headers.  For this instance, a
  reduction of about 40% is achieved by replacing the include with the
  simple fact that the device is some kind of a struct.

  Unlike the much larger module.h cleanup, this one is simply two
  commits.  One to fix the implicit <linux/device.h> users, and then one
  to delete the device.h includes from the linux/include/ dir wherever
  possible."

* tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:
  device.h: audit and cleanup users in main include dir
  device.h: cleanup users outside of linux/include (C files)

diff --cc drivers/base/regmap/regcache-lzo.c
Simple merge

diff --cc drivers/base/regmap/regcache-rbtree.c
Simple merge

diff --cc drivers/base/regmap/regcache.c
Simple merge

diff --cc drivers/base/regmap/regmap-debugfs.c
Simple merge

diff --cc drivers/mfd/wm8994-regmap.c
Simple merge

diff --cc include/linux/amba/pl022.h
Simple merge

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

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

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

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

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

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

diff --cc include/linux/mmc/card.h
Simple merge

diff --cc include/linux/mmc/host.h
Simple merge

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

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

diff --cc include/linux/pm_domain.h
index 1236d262b3e868700e330af2fcb0783aa08702cd,fa2e20b621b018f9a1d51e032213d5f2ba375e27..91f8286106eaed1e9b8e9acdeab5a8efe9a6f452
--- 1/include/linux/pm_domain.h
--- 2/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h
@@@ -10,8 -10,9 +10,10 @@@
  #define _LINUX_PM_DOMAIN_H
  
  #include <linux/device.h>
+ #include <linux/mutex.h>
+ #include <linux/pm.h>
  #include <linux/err.h>
 +#include <linux/of.h>
  
  enum gpd_status {
        GPD_STATE_ACTIVE = 0,   /* PM domain is active */

diff --cc include/linux/regmap.h
index 5d7e6add0084257b219052ff2f8ab6c2ccc34d28,765736cbb5093380ab6be278732bcd9028f764dd..a90abb6bfa6400402b516865df47db182dd5e0a0
--- 1/include/linux/regmap.h
--- 2/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@@ -16,10 -16,9 +16,10 @@@
  #include <linux/list.h>
  
  struct module;
+ struct device;
  struct i2c_client;
  struct spi_device;
 +struct regmap;
  
  /* An enum of all the supported cache types */
  enum regcache_type {

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

diff --cc include/media/v4l2-ctrls.h
Simple merge

diff --cc include/media/v4l2-ioctl.h
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc include/scsi/scsi_device.h
Simple merge

diff --cc include/sound/core.h
Simple merge

diff --cc include/sound/soc-dapm.h
Simple merge

diff --cc include/trace/events/regmap.h
Simple merge

diff --cc include/trace/events/writeback.h
Simple merge

diff --cc sound/core/init.c
Simple merge

diff --cc sound/core/pcm.c
Simple merge