diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-09 13:16:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-09 13:16:33 -0400 |
| commit | 3db6857c9139662dec5504d0204ad6ac3000cad0 (patch) | |
| tree | d2a6161054f34ff96cf7dcac8b085a69bbb78cee | |
| parent | 8a3ddb88fb0046f2f905ecfdeed6a63c24e66a89 (diff) | |
| parent | 1855f1b1074ea8a76ced0f3ef25bbecd6b2a7222 (diff) | |
| download | linux-3.10-3db6857c9139662dec5504d0204ad6ac3000cad0.tar.gz linux-3.10-3db6857c9139662dec5504d0204ad6ac3000cad0.tar.bz2 linux-3.10-3db6857c9139662dec5504d0204ad6ac3000cad0.zip | |
Merge tag 'disintegrate-isdn-20121009' of git://git.infradead.org/users/dhowells/linux-headers
UAPI Disintegration 2012-10-09
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/isdn/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/isdn/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/isdn/capicmd.h (renamed from include/linux/isdn/capicmd.h) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/isdn/Kbuild b/include/linux/isdn/Kbuild index 991cdb29ab2..e69de29bb2d 100644 --- a/include/linux/isdn/Kbuild +++ b/include/linux/isdn/Kbuild @@ -1 +0,0 @@ -header-y += capicmd.h diff --git a/include/uapi/linux/isdn/Kbuild b/include/uapi/linux/isdn/Kbuild index aafaa5aa54d..89e52850bf2 100644 --- a/include/uapi/linux/isdn/Kbuild +++ b/include/uapi/linux/isdn/Kbuild @@ -1 +1,2 @@ # UAPI Header export list +header-y += capicmd.h diff --git a/include/linux/isdn/capicmd.h b/include/uapi/linux/isdn/capicmd.h index b58635f722d..b58635f722d 100644 --- a/include/linux/isdn/capicmd.h +++ b/include/uapi/linux/isdn/capicmd.h |