diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:07:40 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 11:07:40 +0900 |
| commit | 125aae1d7f51ee28d821a1374a2b7be13972c5dc (patch) | |
| tree | cd366e9940f8fdff1c8dc23eaac2ec9b272b9fa3 /include | |
| parent | 79c63eeb805d086f52e5efda9c8d321beeed0b2b (diff) | |
| parent | 60fe5771be6aa3f37d5887aa01c04f733130a559 (diff) | |
| download | linux-next-125aae1d7f51ee28d821a1374a2b7be13972c5dc.tar.gz | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mmc/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/mmc/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/mmc/ioctl.h (renamed from include/linux/mmc/ioctl.h) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mmc/Kbuild b/include/linux/mmc/Kbuild index 1fb26448faa9..e69de29bb2d1 100644 --- a/include/linux/mmc/Kbuild +++ b/include/linux/mmc/Kbuild @@ -1 +0,0 @@ -header-y += ioctl.h diff --git a/include/uapi/linux/mmc/Kbuild b/include/uapi/linux/mmc/Kbuild index aafaa5aa54d4..8c1d2cb75e33 100644 --- a/include/uapi/linux/mmc/Kbuild +++ b/include/uapi/linux/mmc/Kbuild @@ -1 +1,2 @@ # UAPI Header export list +header-y += ioctl.h diff --git a/include/linux/mmc/ioctl.h b/include/uapi/linux/mmc/ioctl.h index 1f5e68923929..1f5e68923929 100644 --- a/include/linux/mmc/ioctl.h +++ b/include/uapi/linux/mmc/ioctl.h |