1. 06 11月, 2012 1 次提交
  2. 12 10月, 2012 1 次提交
    • M
      mmc: mxs-mmc: Fix merge issue causing build error · 4c5bb2e4
      Marek Vasut 提交于
      The following error appeared due to a merge problem; the patches:
      
      fc108d24 "mmc: mxs-mmc: fix deadlock caused by recursion loop"
      829c1bf4 "mmc: spi: Pull out parts shared between MMC and SPI"
      
      came in through separate branches and cause this build error when
      combined.
      
      drivers/mmc/host/mxs-mmc.c: In function 'mxs_mmc_enable_sdio_irq':
      drivers/mmc/host/mxs-mmc.c:527:3: error: 'struct mxs_mmc_host' has no member named 'base'
      drivers/mmc/host/mxs-mmc.c:527:3: error: 'struct mxs_mmc_host' has no member named 'devid'
      make[3]: *** [drivers/mmc/host/mxs-mmc.o] Error 1
      
      This patch corrects the issue.
      Signed-off-by: NMarek Vasut <marex@denx.de>
      Cc: Fabio Estevam <fabio.estevam@freescale.com>
      Cc: Shawn Guo <shawn.guo@linaro.org>
      Signed-off-by: NChris Ball <cjb@laptop.org>
      4c5bb2e4
  3. 08 10月, 2012 8 次提交
  4. 07 10月, 2012 1 次提交
  5. 06 10月, 2012 1 次提交
  6. 03 10月, 2012 21 次提交
  7. 21 9月, 2012 1 次提交
    • T
      ARM: OMAP1: Make plat/mux.h omap1 only · 70c494c3
      Tony Lindgren 提交于
      We are moving omap2+ to use the device tree based pinctrl-single.c
      and will be removing the old mux framework. This will remove the
      omap1 specific parts from plat-omap.
      Acked-by: NFelipe Balbi <balbi@ti.com>
      Cc: Grant Likely <grant.likely@secretlab.ca>
      Cc: Alan Stern <stern@rowland.harvard.edu>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: Richard Purdie <rpurdie@rpsys.net>
      Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
      Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
      Cc: linux-usb@vger.kernel.org
      Cc: linux-pcmcia@lists.infradead.org
      Cc: spi-devel-general@lists.sourceforge.net
      Signed-off-by: NTony Lindgren <tony@atomide.com>
      70c494c3
  8. 19 9月, 2012 6 次提交