Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (67 commits)
  mmc: don't use weight32()
  pxamci: support arbitrary block size
  sdio: make the IRQ thread more resilient in the presence of bad states
  sdio: fix IRQ diagnostic message
  sdhci: remove old dma module params
  sdhci: add SDHCI_QUIRK_BROKEN_DMA quirk
  sdhci: remove DMA capability check from controller's PCI Class reg
  sdhci: fix a typo
  mmc: Disabler for Ricoh MMC controller
  sdio: adaptive interrupt polling
  mmc: pxamci: add SDIO card interrupt reporting capability
  mmc: pxamci: set proper buswidth capabilities according to PXA flavor
  mmc: pxamci: set proper block capabilities according to PXA flavor
  mmc: pxamci: better pending IRQ determination
  arm: i.MX/MX1 SDHC implements SD cards read-only switch read-back
  mmc: add led trigger
  mmc_spi host driver
  MMC core learns about SPI
  MMC/SD card driver learns SPI
  MMC headers learn about SPI
  ...

1 files changed, 20 insertions, 0 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 8a09021d8c59..1e5d4d693195 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -484,6 +484,22 @@ static int do_parisc_entry(const char *filename, struct parisc_device_id *id,
         return 1;
 }
 
+/* Looks like: sdio:cNvNdN. */
+static int do_sdio_entry(const char *filename,
+                        struct sdio_device_id *id, char *alias)
+{
+        id->class = TO_NATIVE(id->class);
+        id->vendor = TO_NATIVE(id->vendor);
+        id->device = TO_NATIVE(id->device);
+
+        strcpy(alias, "sdio:");
+        ADD(alias, "c", id->class != (__u8)SDIO_ANY_ID, id->class);
+        ADD(alias, "v", id->vendor != (__u16)SDIO_ANY_ID, id->vendor);
+        ADD(alias, "d", id->device != (__u16)SDIO_ANY_ID, id->device);
+
+        return 1;
+}
+
 /* Ignore any prefix, eg. v850 prepends _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -599,6 +615,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                 do_table(symval, sym->st_size,
                          sizeof(struct parisc_device_id), "parisc",
                          do_parisc_entry, mod);
+        else if (sym_is(symname, "__mod_sdio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct sdio_device_id), "sdio",
+                         do_sdio_entry, mod);
 }
 
 /* Now add out buffered information to the generated C source */