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