Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...

2 files changed, 9 insertions, 10 deletions

diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig
index 70ecd0c19500..5313c9ea44dc 100644
--- a/drivers/isdn/hisax/Kconfig
+++ b/drivers/isdn/hisax/Kconfig
@@ -389,8 +389,8 @@ config HISAX_TELES_CS
 comment "HiSax sub driver modules"
 
 config HISAX_ST5481
-        tristate "ST5481 USB ISDN modem (EXPERIMENTAL)"
-        depends on USB && EXPERIMENTAL
+        tristate "ST5481 USB ISDN modem"
+        depends on USB
         select ISDN_HDLC
         select CRC_CCITT
         select BITREVERSE
@@ -399,20 +399,19 @@ config HISAX_ST5481
           e.g. the BeWan Gazel 128 USB
 
 config HISAX_HFCUSB
-        tristate "HFC USB based ISDN modems (EXPERIMENTAL)"
-        depends on USB && EXPERIMENTAL
+        tristate "HFC USB based ISDN modems"
+        depends on USB
         help
           This enables the driver for HFC USB based ISDN modems.
 
 config HISAX_HFC4S8S
-        tristate "HFC-4S/8S based ISDN cards (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        tristate "HFC-4S/8S based ISDN cards"
         help
           This enables the driver for HFC-4S/8S based ISDN cards.
 
 config HISAX_FRITZ_PCIPNP
-        tristate "AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)"
-        depends on PCI && EXPERIMENTAL
+        tristate "AVM Fritz!Card PCI/PCIv2/PnP support"
+        depends on PCI
         help
           This enables the driver for the AVM Fritz!Card PCI,
           Fritz!Card PCI v2 and Fritz!Card PnP.
diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c
index 3e245712bba7..da30c5cb9609 100644
--- a/drivers/isdn/mISDN/core.c
+++ b/drivers/isdn/mISDN/core.c
@@ -168,13 +168,13 @@ static struct class mISDN_class = {
 };
 
 static int
-_get_mdevice(struct device *dev, void *id)
+_get_mdevice(struct device *dev, const void *id)
 {
         struct mISDNdevice *mdev = dev_to_mISDN(dev);
 
         if (!mdev)
                 return 0;
-        if (mdev->id != *(u_int *)id)
+        if (mdev->id != *(const u_int *)id)
                 return 0;
         return 1;
 }