Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-2
+1
-1
drivers/mmc/host/mxs-mmc.c
+1
-1
drivers/mmc/host/mxs-mmc.c
···
525
525
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
526
526
ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
527
527
writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
528
-
host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);
528
+
ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);
529
529
} else {
530
530
writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
531
531
ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
-1
include/linux/mmc/Kbuild
-1
include/linux/mmc/Kbuild
···
1
-
header-y += ioctl.h
include/linux/mmc/ioctl.h
include/uapi/linux/mmc/ioctl.h
include/linux/mmc/ioctl.h
include/uapi/linux/mmc/ioctl.h