diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 16:40:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-22 16:40:47 -0400 |
commit | 62429f434091586d54b37b8dd46076e7c08b27b9 (patch) | |
tree | d8fd38000961eb30e37b90026efebb5ae946c1ad /include/linux/Kbuild | |
parent | 26defe34e48e18b058b773f60467729c64917490 (diff) | |
parent | f845fced913b1437659bb5baf187698547697afe (diff) |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: (41 commits)
udf: use crc_itu_t from lib instead of udf_crc
udf: Fix compilation warnings when UDF debug is on
udf: Fix bug in VAT mapping code
udf: Add read-only support for 2.50 UDF media
udf: Fix handling of multisession media
udf: Mount filesystem read-only if it has pseudooverwrite partition
udf: Handle VAT packed inside inode properly
udf: Allow loading of VAT inode
udf: Fix detection of VAT version
udf: Silence warning about accesses beyond end of device
udf: Improve anchor block detection
udf: Cleanup anchor block detection.
udf: Move processing of virtual partitions
udf: Move filling of partition descriptor info into a separate function
udf: Improve error recovery on mount
udf: Cleanup volume descriptor sequence processing
udf: fix anchor point detection
udf: Remove declarations of arrays of size UDF_NAME_LEN (256 bytes)
udf: Remove checking of existence of filename in udf_add_entry()
udf: Mark udf_process_sequence() as noinline
...
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r-- | include/linux/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index b3d9ccde0c27..34624835d90f 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild | |||
@@ -150,6 +150,7 @@ header-y += tiocl.h | |||
150 | header-y += tipc.h | 150 | header-y += tipc.h |
151 | header-y += tipc_config.h | 151 | header-y += tipc_config.h |
152 | header-y += toshiba.h | 152 | header-y += toshiba.h |
153 | header-y += udf_fs_i.h | ||
153 | header-y += ultrasound.h | 154 | header-y += ultrasound.h |
154 | header-y += un.h | 155 | header-y += un.h |
155 | header-y += utime.h | 156 | header-y += utime.h |
@@ -334,7 +335,6 @@ unifdef-y += time.h | |||
334 | unifdef-y += timex.h | 335 | unifdef-y += timex.h |
335 | unifdef-y += tty.h | 336 | unifdef-y += tty.h |
336 | unifdef-y += types.h | 337 | unifdef-y += types.h |
337 | unifdef-y += udf_fs_i.h | ||
338 | unifdef-y += udp.h | 338 | unifdef-y += udp.h |
339 | unifdef-y += uinput.h | 339 | unifdef-y += uinput.h |
340 | unifdef-y += uio.h | 340 | unifdef-y += uio.h |