Commit 125aae1d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

Pull two more mmc changes from Chris Ball:

 - Disintegrate UAPI

 - fix a mismerge that caused a build error.

* tag 'mmc-merge-for-3.7-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc:
  UAPI: (Scripted) Disintegrate include/linux/mmc
  mmc: mxs-mmc: Fix merge issue causing build error
parents 79c63eeb 60fe5771

drivers/mmc/host/mxs-mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static void mxs_mmc_enable_sdio_irq(struct mmc_host *mmc, int enable) 
		writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,

		       ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);

		writel(BM_SSP_CTRL1_SDIO_IRQ_EN,

		       host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);

		       ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);

	} else {

		writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,

		       ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);

include/linux/mmc/Kbuild

+0 −1
Original line number Diff line number Diff line 
header-y += ioctl.h

include/uapi/linux/mmc/Kbuild

+1 −0
Original line number Diff line number Diff line 
# UAPI Header export list

header-y += ioctl.h

CRA Git | Maintained and supported by SUSTech CRA and CCSE