Merge remote-tracking branch 'char-misc/char-misc-next'

Conflicts:
	drivers/mfd/rtsx_pcr.c
	drivers/misc/atmel-ssc.c
	drivers/mmc/host/Kconfig
	drivers/mmc/host/rtsx_pci_sdmmc.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
Simple merge

diff --cc drivers/char/tpm/tpm_i2c_infineon.c
Simple merge

diff --cc drivers/char/tpm/tpm_ibmvtpm.c
Simple merge

diff --cc drivers/char/tpm/tpm_infineon.c
Simple merge

diff --cc drivers/char/tpm/tpm_tis.c
Simple merge

diff --cc drivers/char/virtio_console.c
Simple merge

diff --cc drivers/misc/atmel-ssc.c
index d07a9eda7fff4a29aebc43892658b339b4ebb196,c58f9abcb35659f58ee9fbdbaad5c387d366ad06..158da5a81a661824a2dca0ee2a9fe93fb5cacfb6
--- 1/drivers/misc/atmel-ssc.c
--- 2/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@@ -186,10 -125,19 +186,10 @@@ static int ssc_probe(struct platform_de
        dev_info(&pdev->dev, "Atmel SSC device at 0x%p (irq %d)\n",
                        ssc->regs, ssc->irq);
  
 -      goto out;
 -
 -out_unmap:
 -      iounmap(ssc->regs);
 -out_clk:
 -      clk_put(ssc->clk);
 -out_free:
 -      kfree(ssc);
 -out:
 -      return retval;
 +      return 0;
  }
  
- static int __devexit ssc_remove(struct platform_device *pdev)
+ static int ssc_remove(struct platform_device *pdev)
  {
        struct ssc_device *ssc = platform_get_drvdata(pdev);
  
@@@ -204,13 -155,21 +204,13 @@@ static struct platform_driver ssc_drive
        .driver         = {
                .name           = "ssc",
                .owner          = THIS_MODULE,
 +              .of_match_table = of_match_ptr(atmel_ssc_dt_ids),
        },
-       .remove         = __devexit_p(ssc_remove),
 +      .id_table       = atmel_ssc_devtypes,
 +      .probe          = ssc_probe,
++      .remove         = ssc_remove,
  };
 -
 -static int __init ssc_init(void)
 -{
 -      return platform_driver_probe(&ssc_driver, ssc_probe);
 -}
 -module_init(ssc_init);
 -
 -static void __exit ssc_exit(void)
 -{
 -      platform_driver_unregister(&ssc_driver);
 -}
 -module_exit(ssc_exit);
 +module_platform_driver(ssc_driver);
  
  MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
  MODULE_DESCRIPTION("SSC driver for Atmel AVR32 and AT91");

diff --cc drivers/misc/pti.c
index a1f0d174e687e5a57dd795b9c6c0ac6a0f5f4355,7003031c9181b4a5a08d25bdba2f788b4a5f092d..f84ff0c060358d2d4e2fa6e78d070fd385f0eaa4
--- 1/drivers/misc/pti.c
--- 2/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
@@@ -879,10 -879,9 +879,10 @@@ err
   *               PCI bus.
   * @pdev: variable containing pci info of PTI.
   */
- static void __devexit pti_pci_remove(struct pci_dev *pdev)
+ static void pti_pci_remove(struct pci_dev *pdev)
  {
        struct pti_dev *drv_data = pci_get_drvdata(pdev);
 +      unsigned int a;
  
        unregister_console(&pti_console);
  

diff --cc drivers/mmc/host/Makefile
index b648058d718234e7b69dbceabd57df6bf90489fd,8aa592d14c4eac95e18ef61729ca949ad4a02799..e4e218c930bda626b6d9b62a30bcb5792817c458
--- 1/drivers/mmc/host/Makefile
--- 2/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@@ -45,10 -45,9 +45,12 @@@ obj-$(CONFIG_MMC_SH_MMCIF)  += sh_mmcif.
  obj-$(CONFIG_MMC_JZ4740)      += jz4740_mmc.o
  obj-$(CONFIG_MMC_VUB300)      += vub300.o
  obj-$(CONFIG_MMC_USHC)                += ushc.o
 +obj-$(CONFIG_MMC_WMT)         += wmt-sdmmc.o
 +
 +obj-$(CONFIG_MMC_REALTEK_PCI) += rtsx_pci_sdmmc.o
  
+ obj-$(CONFIG_MMC_REALTEK_PCI) += rtsx_pci_sdmmc.o
+ 
  obj-$(CONFIG_MMC_SDHCI_PLTFM)         += sdhci-pltfm.o
  obj-$(CONFIG_MMC_SDHCI_CNS3XXX)               += sdhci-cns3xxx.o
  obj-$(CONFIG_MMC_SDHCI_ESDHC_IMX)     += sdhci-esdhc-imx.o