summaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-28 09:44:56 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-28 09:44:56 -0700
commite4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch)
treeea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /include/linux/Kbuild
parent81280572ca6f54009edfa4deee563e8678784218 (diff)
parenta4ac0d847af9dd34d5953a5e264400326144b6b2 (diff)
downloadlinux-stable-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz
linux-stable-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.bz2
linux-stable-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 831c4634162c..9c1683e473cb 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -326,10 +326,6 @@ header-y += serio.h
header-y += shm.h
header-y += signal.h
header-y += signalfd.h
-header-y += smb.h
-header-y += smb_fs.h
-header-y += smb_mount.h
-header-y += smbno.h
header-y += snmp.h
header-y += socket.h
header-y += sockios.h