aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
commitc71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch)
treeecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/Kbuild
parentea53c912f8a86a8567697115b6a0d8152beee5c8 (diff)
parent6a00f206debf8a5c8899055726ad127dbeeed098 (diff)
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts: litmus/sched_cedf.c
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild26
1 files changed, 17 insertions, 9 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 4e8ea8c8ec1e..01f636275057 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -1,8 +1,10 @@
1header-y += byteorder/ 1header-y += byteorder/
2header-y += can/ 2header-y += can/
3header-y += caif/
3header-y += dvb/ 4header-y += dvb/
4header-y += hdlc/ 5header-y += hdlc/
5header-y += isdn/ 6header-y += isdn/
7header-y += mmc/
6header-y += nfsd/ 8header-y += nfsd/
7header-y += raid/ 9header-y += raid/
8header-y += spi/ 10header-y += spi/
@@ -20,15 +22,18 @@ header-y += wimax/
20objhdr-y += version.h 22objhdr-y += version.h
21 23
22ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \ 24ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
23 $(srctree)/include/asm-$(SRCARCH)/a.out.h),) 25 $(srctree)/include/asm-$(SRCARCH)/a.out.h \
26 $(INSTALL_HDR_PATH)/include/asm-*/a.out.h),)
24header-y += a.out.h 27header-y += a.out.h
25endif 28endif
26ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \ 29ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
27 $(srctree)/include/asm-$(SRCARCH)/kvm.h),) 30 $(srctree)/include/asm-$(SRCARCH)/kvm.h \
31 $(INSTALL_HDR_PATH)/include/asm-*/kvm.h),)
28header-y += kvm.h 32header-y += kvm.h
29endif 33endif
30ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \ 34ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
31 $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),) 35 $(srctree)/include/asm-$(SRCARCH)/kvm_para.h \
36 $(INSTALL_HDR_PATH)/include/asm-*/kvm_para.h),)
32header-y += kvm_para.h 37header-y += kvm_para.h
33endif 38endif
34 39
@@ -118,6 +123,7 @@ header-y += eventpoll.h
118header-y += ext2_fs.h 123header-y += ext2_fs.h
119header-y += fadvise.h 124header-y += fadvise.h
120header-y += falloc.h 125header-y += falloc.h
126header-y += fanotify.h
121header-y += fb.h 127header-y += fb.h
122header-y += fcntl.h 128header-y += fcntl.h
123header-y += fd.h 129header-y += fd.h
@@ -154,6 +160,7 @@ header-y += icmpv6.h
154header-y += if.h 160header-y += if.h
155header-y += if_addr.h 161header-y += if_addr.h
156header-y += if_addrlabel.h 162header-y += if_addrlabel.h
163header-y += if_alg.h
157header-y += if_arcnet.h 164header-y += if_arcnet.h
158header-y += if_arp.h 165header-y += if_arp.h
159header-y += if_bonding.h 166header-y += if_bonding.h
@@ -227,6 +234,7 @@ header-y += magic.h
227header-y += major.h 234header-y += major.h
228header-y += map_to_7segment.h 235header-y += map_to_7segment.h
229header-y += matroxfb.h 236header-y += matroxfb.h
237header-y += media.h
230header-y += mempolicy.h 238header-y += mempolicy.h
231header-y += meye.h 239header-y += meye.h
232header-y += mii.h 240header-y += mii.h
@@ -270,6 +278,7 @@ header-y += nfsacl.h
270header-y += nl80211.h 278header-y += nl80211.h
271header-y += nubus.h 279header-y += nubus.h
272header-y += nvram.h 280header-y += nvram.h
281header-y += omap3isp.h
273header-y += omapfb.h 282header-y += omapfb.h
274header-y += oom.h 283header-y += oom.h
275header-y += param.h 284header-y += param.h
@@ -294,6 +303,7 @@ header-y += ppp-comp.h
294header-y += ppp_defs.h 303header-y += ppp_defs.h
295header-y += pps.h 304header-y += pps.h
296header-y += prctl.h 305header-y += prctl.h
306header-y += ptp_clock.h
297header-y += ptrace.h 307header-y += ptrace.h
298header-y += qnx4_fs.h 308header-y += qnx4_fs.h
299header-y += qnxtypes.h 309header-y += qnxtypes.h
@@ -301,6 +311,7 @@ header-y += quota.h
301header-y += radeonfb.h 311header-y += radeonfb.h
302header-y += random.h 312header-y += random.h
303header-y += raw.h 313header-y += raw.h
314header-y += rds.h
304header-y += reboot.h 315header-y += reboot.h
305header-y += reiserfs_fs.h 316header-y += reiserfs_fs.h
306header-y += reiserfs_xattr.h 317header-y += reiserfs_xattr.h
@@ -325,10 +336,6 @@ header-y += serio.h
325header-y += shm.h 336header-y += shm.h
326header-y += signal.h 337header-y += signal.h
327header-y += signalfd.h 338header-y += signalfd.h
328header-y += smb.h
329header-y += smb_fs.h
330header-y += smb_mount.h
331header-y += smbno.h
332header-y += snmp.h 339header-y += snmp.h
333header-y += socket.h 340header-y += socket.h
334header-y += sockios.h 341header-y += sockios.h
@@ -367,11 +374,12 @@ header-y += unistd.h
367header-y += usbdevice_fs.h 374header-y += usbdevice_fs.h
368header-y += utime.h 375header-y += utime.h
369header-y += utsname.h 376header-y += utsname.h
377header-y += uvcvideo.h
378header-y += v4l2-mediabus.h
379header-y += v4l2-subdev.h
370header-y += veth.h 380header-y += veth.h
371header-y += vhost.h 381header-y += vhost.h
372header-y += videodev.h
373header-y += videodev2.h 382header-y += videodev2.h
374header-y += videotext.h
375header-y += virtio_9p.h 383header-y += virtio_9p.h
376header-y += virtio_balloon.h 384header-y += virtio_balloon.h
377header-y += virtio_blk.h 385header-y += virtio_blk.h