diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 07:43:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-03-18 07:43:14 -0700 |
| commit | 92f53c6f1e47d92b40b1e9e1662b0056c783b962 (patch) | |
| tree | 850cba7afebec402f8db3fa6e9ea5199e858ffd7 /include/linux/Kbuild | |
| parent | ff69c00f0a58383f1f60dd2756e54a857f08d249 (diff) | |
| parent | 40044ce0bf2b7e548584d91f108444e83ed5eab3 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "unexport bio_{,un}map_user"
relay: fix subbuf_splice_actor() adding too many pages
The ps2esdi driver was marked as BROKEN more than two years ago due to being
Diffstat (limited to 'include/linux/Kbuild')
| -rw-r--r-- | include/linux/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index 0fac822c1157..4108b38ebb16 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -127,7 +127,6 @@ header-y += pkt_sched.h header-y += posix_types.h header-y += ppdev.h header-y += prctl.h -header-y += ps2esdi.h header-y += qnxtypes.h header-y += quotaio_v1.h header-y += quotaio_v2.h |