Merge tag 'disintegrate-isdn-20121009' of git://git.infradead.org/use…

…rs/dhowells/linux-headers UAPI Disintegration 2012-10-09 Signed-off-by: David S. Miller <[email protected]>
syzer · Oct 9, 2012 · 3db6857 · 3db6857
2 parents 8a3ddb8 + 1855f1b
commit 3db6857
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git 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
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += capicmd.h
diff --git a/include/linux/isdn/capicmd.h → include/uapi/linux/isdn/capicmd.h b/include/linux/isdn/capicmd.h → include/uapi/linux/isdn/capicmd.h