Merge tag 'disintegrate-wimax-20121009' of git://git.infradead.org/us…

…ers/dhowells/linux-headers UAPI Disintegration 2012-10-09 Signed-off-by: David S. Miller <davem@davemloft.net>
git-mirror · Oct 11, 2012 · 0d0d0b1 · 0d0d0b1
2 parents 0e24c4f + 1e256b3
commit 0d0d0b1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/include/linux/wimax/Kbuild b/include/linux/wimax/Kbuild
@@ -1 +0,0 @@
-header-y += i2400m.h

diff --git a/include/uapi/linux/wimax/Kbuild b/include/uapi/linux/wimax/Kbuild
@@ -1 +1,2 @@
 # UAPI Header export list
+header-y += i2400m.h
diff --git a/include/linux/wimax/i2400m.h → include/uapi/linux/wimax/i2400m.h b/include/linux/wimax/i2400m.h → include/uapi/linux/wimax/i2400m.h