diff options
| author | David S. Miller <davem@davemloft.net> | 2012-10-11 15:15:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-11 15:15:35 -0400 |
| commit | 0d0d0b160c389574f67cdcf6766ba9597102495d (patch) | |
| tree | 15b3981d2e60438fa905408135e249b61b69630d | |
| parent | 0e24c4fc52b16f0a1102a933f636d2f350c41098 (diff) | |
| parent | 1e256b340d9574fd1bf31b73f16c4c474502692c (diff) | |
| download | linux-3.10-0d0d0b160c389574f67cdcf6766ba9597102495d.tar.gz linux-3.10-0d0d0b160c389574f67cdcf6766ba9597102495d.tar.bz2 linux-3.10-0d0d0b160c389574f67cdcf6766ba9597102495d.zip | |
Merge tag 'disintegrate-wimax-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/wimax/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/wimax/Kbuild | 1 | ||||
| -rw-r--r-- | include/uapi/linux/wimax/i2400m.h (renamed from include/linux/wimax/i2400m.h) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/wimax/Kbuild b/include/linux/wimax/Kbuild index 3cb4f269bb0..e69de29bb2d 100644 --- 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 index aafaa5aa54d..1c97be49971 100644 --- 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 b/include/uapi/linux/wimax/i2400m.h index 62d35615356..62d35615356 100644 --- a/include/linux/wimax/i2400m.h +++ b/include/uapi/linux/wimax/i2400m.h |