diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /include/mtd/Kbuild | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
| download | kernel-crypto-bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775.tar.gz kernel-crypto-bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775.tar.xz kernel-crypto-bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'include/mtd/Kbuild')
| -rw-r--r-- | include/mtd/Kbuild | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild index e0fe92b03a4..4d46b3bdebd 100644 --- a/include/mtd/Kbuild +++ b/include/mtd/Kbuild @@ -3,3 +3,5 @@ header-y += jffs2-user.h header-y += mtd-abi.h header-y += mtd-user.h header-y += nftl-user.h +header-y += ubi-header.h +header-y += ubi-user.h |