aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2010-08-14 04:15:12 -0400
committerSam Ravnborg <sam@ravnborg.org>2010-08-14 16:26:51 -0400
commit60641aa1f379820e99ac7f45a38b43795670c741 (patch)
treea4a68780ba75bbf8f2fc96dba880ea39da2c717b
parentc29c08b59875fe053471cf9eb66f8cfef39bc509 (diff)
include: replace unifdef-y with header-y
unifdef-y and header-y has same semantic. So there is no need to have both. Drop the unifdef-y variant and sort all lines again Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--include/asm-generic/Kbuild9
-rw-r--r--include/asm-generic/Kbuild.asm67
-rw-r--r--include/drm/Kbuild26
-rw-r--r--include/linux/Kbuild468
-rw-r--r--include/linux/byteorder/Kbuild4
-rw-r--r--include/linux/dvb/Kbuild7
-rw-r--r--include/linux/netfilter/Kbuild19
-rw-r--r--include/linux/netfilter_arp/Kbuild3
-rw-r--r--include/linux/netfilter_bridge/Kbuild5
-rw-r--r--include/linux/netfilter_ipv4/Kbuild5
-rw-r--r--include/linux/netfilter_ipv6/Kbuild5
-rw-r--r--include/linux/nfsd/Kbuild12
-rw-r--r--include/linux/sunrpc/Kbuild2
-rw-r--r--include/sound/Kbuild9
-rw-r--r--include/video/Kbuild5
15 files changed, 321 insertions, 325 deletions
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index eb62334cda29..53f91b1ae53a 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -3,6 +3,8 @@ header-y += bitsperlong.h
3header-y += errno-base.h 3header-y += errno-base.h
4header-y += errno.h 4header-y += errno.h
5header-y += fcntl.h 5header-y += fcntl.h
6header-y += int-l64.h
7header-y += int-ll64.h
6header-y += ioctl.h 8header-y += ioctl.h
7header-y += ioctls.h 9header-y += ioctls.h
8header-y += ipcbuf.h 10header-y += ipcbuf.h
@@ -12,10 +14,12 @@ header-y += msgbuf.h
12header-y += param.h 14header-y += param.h
13header-y += poll.h 15header-y += poll.h
14header-y += posix_types.h 16header-y += posix_types.h
17header-y += resource.h
15header-y += sembuf.h 18header-y += sembuf.h
16header-y += setup.h 19header-y += setup.h
17header-y += shmbuf.h 20header-y += shmbuf.h
18header-y += shmparam.h 21header-y += shmparam.h
22header-y += siginfo.h
19header-y += signal-defs.h 23header-y += signal-defs.h
20header-y += signal.h 24header-y += signal.h
21header-y += socket.h 25header-y += socket.h
@@ -28,8 +32,3 @@ header-y += termios.h
28header-y += types.h 32header-y += types.h
29header-y += ucontext.h 33header-y += ucontext.h
30header-y += unistd.h 34header-y += unistd.h
31
32unifdef-y += int-l64.h
33unifdef-y += int-ll64.h
34unifdef-y += resource.h
35unifdef-y += siginfo.h
diff --git a/include/asm-generic/Kbuild.asm b/include/asm-generic/Kbuild.asm
index 96d7c9804dc1..c5d2e5dd871b 100644
--- a/include/asm-generic/Kbuild.asm
+++ b/include/asm-generic/Kbuild.asm
@@ -1,5 +1,5 @@
1ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \ 1ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
2 $(srctree)/include/asm-$(SRCARCH)/kvm.h),) 2 $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
3header-y += kvm.h 3header-y += kvm.h
4endif 4endif
5 5
@@ -9,36 +9,37 @@ header-y += kvm_para.h
9endif 9endif
10 10
11ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \ 11ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
12 $(srctree)/include/asm-$(SRCARCH)/a.out.h),) 12 $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
13unifdef-y += a.out.h 13header-y += a.out.h
14endif 14endif
15unifdef-y += auxvec.h 15
16unifdef-y += byteorder.h 16header-y += auxvec.h
17unifdef-y += bitsperlong.h 17header-y += bitsperlong.h
18unifdef-y += errno.h 18header-y += byteorder.h
19unifdef-y += fcntl.h 19header-y += errno.h
20unifdef-y += ioctl.h 20header-y += fcntl.h
21unifdef-y += ioctls.h 21header-y += ioctl.h
22unifdef-y += ipcbuf.h 22header-y += ioctls.h
23unifdef-y += mman.h 23header-y += ipcbuf.h
24unifdef-y += msgbuf.h 24header-y += mman.h
25unifdef-y += param.h 25header-y += msgbuf.h
26unifdef-y += poll.h 26header-y += param.h
27unifdef-y += posix_types.h 27header-y += poll.h
28unifdef-y += ptrace.h 28header-y += posix_types.h
29unifdef-y += resource.h 29header-y += ptrace.h
30unifdef-y += sembuf.h 30header-y += resource.h
31unifdef-y += setup.h 31header-y += sembuf.h
32unifdef-y += shmbuf.h 32header-y += setup.h
33unifdef-y += sigcontext.h 33header-y += shmbuf.h
34unifdef-y += siginfo.h 34header-y += sigcontext.h
35unifdef-y += signal.h 35header-y += siginfo.h
36unifdef-y += socket.h 36header-y += signal.h
37unifdef-y += sockios.h 37header-y += socket.h
38unifdef-y += stat.h 38header-y += sockios.h
39unifdef-y += statfs.h 39header-y += stat.h
40unifdef-y += swab.h 40header-y += statfs.h
41unifdef-y += termbits.h 41header-y += swab.h
42unifdef-y += termios.h 42header-y += termbits.h
43unifdef-y += types.h 43header-y += termios.h
44unifdef-y += unistd.h 44header-y += types.h
45header-y += unistd.h
diff --git a/include/drm/Kbuild b/include/drm/Kbuild
index bd3a1c2fbdb4..ffec177f3481 100644
--- a/include/drm/Kbuild
+++ b/include/drm/Kbuild
@@ -1,12 +1,14 @@
1unifdef-y += drm.h drm_sarea.h drm_mode.h 1header-y += drm.h
2unifdef-y += i810_drm.h 2header-y += drm_mode.h
3unifdef-y += i830_drm.h 3header-y += drm_sarea.h
4unifdef-y += i915_drm.h 4header-y += i810_drm.h
5unifdef-y += mga_drm.h 5header-y += i830_drm.h
6unifdef-y += r128_drm.h 6header-y += i915_drm.h
7unifdef-y += radeon_drm.h 7header-y += mga_drm.h
8unifdef-y += sis_drm.h 8header-y += nouveau_drm.h
9unifdef-y += savage_drm.h 9header-y += r128_drm.h
10unifdef-y += vmwgfx_drm.h 10header-y += radeon_drm.h
11unifdef-y += via_drm.h 11header-y += savage_drm.h
12unifdef-y += nouveau_drm.h 12header-y += sis_drm.h
13header-y += via_drm.h
14header-y += vmwgfx_drm.h
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 9d65d4d0bd9c..626b629429ff 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -15,380 +15,380 @@ header-y += netfilter_bridge/
15header-y += netfilter_ipv4/ 15header-y += netfilter_ipv4/
16header-y += netfilter_ipv6/ 16header-y += netfilter_ipv6/
17header-y += usb/ 17header-y += usb/
18header-y += wimax/
19
20objhdr-y += version.h
21
22ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
23 $(srctree)/include/asm-$(SRCARCH)/a.out.h),)
24header-y += a.out.h
25endif
26ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
27 $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
28header-y += kvm.h
29endif
30ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
31 $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),)
32header-y += kvm_para.h
33endif
18 34
35header-y += acct.h
36header-y += adb.h
37header-y += adfs_fs.h
19header-y += affs_hardblocks.h 38header-y += affs_hardblocks.h
39header-y += agpgart.h
20header-y += aio_abi.h 40header-y += aio_abi.h
41header-y += apm_bios.h
21header-y += arcfb.h 42header-y += arcfb.h
43header-y += atalk.h
44header-y += atm.h
45header-y += atm_eni.h
46header-y += atm_he.h
47header-y += atm_idt77105.h
48header-y += atm_nicstar.h
49header-y += atm_tcp.h
50header-y += atm_zatm.h
22header-y += atmapi.h 51header-y += atmapi.h
23header-y += atmarp.h 52header-y += atmarp.h
24header-y += atmbr2684.h 53header-y += atmbr2684.h
25header-y += atmclip.h 54header-y += atmclip.h
26header-y += atm_eni.h 55header-y += atmdev.h
27header-y += atm_he.h
28header-y += atm_idt77105.h
29header-y += atmioc.h 56header-y += atmioc.h
30header-y += atmlec.h 57header-y += atmlec.h
31header-y += atmmpc.h 58header-y += atmmpc.h
32header-y += atm_nicstar.h
33header-y += atmppp.h 59header-y += atmppp.h
34header-y += atmsap.h 60header-y += atmsap.h
35header-y += atmsvc.h 61header-y += atmsvc.h
36header-y += atm_zatm.h 62header-y += audit.h
63header-y += auto_fs.h
37header-y += auto_fs4.h 64header-y += auto_fs4.h
65header-y += auxvec.h
38header-y += ax25.h 66header-y += ax25.h
39header-y += b1lli.h 67header-y += b1lli.h
40header-y += baycom.h 68header-y += baycom.h
41header-y += bfs_fs.h 69header-y += bfs_fs.h
70header-y += binfmts.h
42header-y += blk_types.h 71header-y += blk_types.h
43header-y += blkpg.h 72header-y += blkpg.h
73header-y += blktrace_api.h
44header-y += bpqether.h 74header-y += bpqether.h
45header-y += bsg.h 75header-y += bsg.h
46header-y += can.h 76header-y += can.h
77header-y += capability.h
78header-y += capi.h
47header-y += cciss_defs.h 79header-y += cciss_defs.h
80header-y += cciss_ioctl.h
48header-y += cdk.h 81header-y += cdk.h
82header-y += cdrom.h
83header-y += cgroupstats.h
49header-y += chio.h 84header-y += chio.h
85header-y += cm4000_cs.h
86header-y += cn_proc.h
87header-y += coda.h
50header-y += coda_psdev.h 88header-y += coda_psdev.h
51header-y += coff.h 89header-y += coff.h
52header-y += comstats.h 90header-y += comstats.h
91header-y += connector.h
53header-y += const.h 92header-y += const.h
54header-y += cgroupstats.h
55header-y += cramfs_fs.h 93header-y += cramfs_fs.h
94header-y += cuda.h
95header-y += cyclades.h
56header-y += cycx_cfm.h 96header-y += cycx_cfm.h
57header-y += dcbnl.h 97header-y += dcbnl.h
58header-y += dlmconstants.h 98header-y += dccp.h
99header-y += dlm.h
59header-y += dlm_device.h 100header-y += dlm_device.h
60header-y += dlm_netlink.h 101header-y += dlm_netlink.h
102header-y += dlm_plock.h
103header-y += dlmconstants.h
61header-y += dm-ioctl.h 104header-y += dm-ioctl.h
62header-y += dm-log-userspace.h 105header-y += dm-log-userspace.h
63header-y += dn.h 106header-y += dn.h
64header-y += dqblk_xfs.h 107header-y += dqblk_xfs.h
108header-y += edd.h
65header-y += efs_fs_sb.h 109header-y += efs_fs_sb.h
66header-y += elf-fdpic.h
67header-y += elf-em.h 110header-y += elf-em.h
111header-y += elf-fdpic.h
112header-y += elf.h
113header-y += elfcore.h
114header-y += errno.h
115header-y += errqueue.h
116header-y += ethtool.h
117header-y += eventpoll.h
118header-y += ext2_fs.h
68header-y += fadvise.h 119header-y += fadvise.h
69header-y += falloc.h 120header-y += falloc.h
121header-y += fanotify.h
122header-y += fb.h
123header-y += fcntl.h
70header-y += fd.h 124header-y += fd.h
71header-y += fdreg.h 125header-y += fdreg.h
72header-y += fib_rules.h 126header-y += fib_rules.h
73header-y += fiemap.h 127header-y += fiemap.h
128header-y += filter.h
74header-y += firewire-cdev.h 129header-y += firewire-cdev.h
75header-y += firewire-constants.h 130header-y += firewire-constants.h
131header-y += flat.h
132header-y += fs.h
76header-y += fuse.h 133header-y += fuse.h
77header-y += genetlink.h 134header-y += futex.h
135header-y += gameport.h
78header-y += gen_stats.h 136header-y += gen_stats.h
137header-y += generic_serial.h
138header-y += genetlink.h
79header-y += gfs2_ondisk.h 139header-y += gfs2_ondisk.h
80header-y += gigaset_dev.h 140header-y += gigaset_dev.h
141header-y += hdlc.h
142header-y += hdlcdrv.h
143header-y += hdreg.h
144header-y += hid.h
145header-y += hiddev.h
146header-y += hidraw.h
147header-y += hpet.h
81header-y += hysdn_if.h 148header-y += hysdn_if.h
149header-y += i2c-dev.h
150header-y += i2c.h
82header-y += i2o-dev.h 151header-y += i2o-dev.h
83header-y += i8k.h 152header-y += i8k.h
153header-y += icmp.h
154header-y += icmpv6.h
155header-y += if.h
156header-y += if_addr.h
84header-y += if_addrlabel.h 157header-y += if_addrlabel.h
85header-y += if_arcnet.h 158header-y += if_arcnet.h
159header-y += if_arp.h
86header-y += if_bonding.h 160header-y += if_bonding.h
161header-y += if_bridge.h
87header-y += if_cablemodem.h 162header-y += if_cablemodem.h
163header-y += if_ec.h
164header-y += if_eql.h
165header-y += if_ether.h
88header-y += if_fc.h 166header-y += if_fc.h
89header-y += if.h 167header-y += if_fddi.h
168header-y += if_frad.h
90header-y += if_hippi.h 169header-y += if_hippi.h
91header-y += if_infiniband.h 170header-y += if_infiniband.h
171header-y += if_link.h
172header-y += if_ltalk.h
92header-y += if_packet.h 173header-y += if_packet.h
174header-y += if_phonet.h
93header-y += if_plip.h 175header-y += if_plip.h
94header-y += if_ppp.h 176header-y += if_ppp.h
177header-y += if_pppol2tp.h
178header-y += if_pppox.h
95header-y += if_slip.h 179header-y += if_slip.h
96header-y += if_strip.h 180header-y += if_strip.h
181header-y += if_tr.h
97header-y += if_tun.h 182header-y += if_tun.h
183header-y += if_tunnel.h
184header-y += if_vlan.h
98header-y += if_x25.h 185header-y += if_x25.h
186header-y += igmp.h
187header-y += in.h
188header-y += in6.h
99header-y += in_route.h 189header-y += in_route.h
190header-y += inet_diag.h
191header-y += inotify.h
192header-y += input.h
100header-y += ioctl.h 193header-y += ioctl.h
194header-y += ip.h
101header-y += ip6_tunnel.h 195header-y += ip6_tunnel.h
196header-y += ip_vs.h
197header-y += ipc.h
198header-y += ipmi.h
102header-y += ipmi_msgdefs.h 199header-y += ipmi_msgdefs.h
103header-y += ipsec.h 200header-y += ipsec.h
104header-y += ip_vs.h 201header-y += ipv6.h
202header-y += ipv6_route.h
105header-y += ipx.h 203header-y += ipx.h
106header-y += irda.h 204header-y += irda.h
205header-y += irqnr.h
206header-y += isdn.h
207header-y += isdn_divertif.h
208header-y += isdn_ppp.h
209header-y += isdnif.h
107header-y += iso_fs.h 210header-y += iso_fs.h
211header-y += ivtv.h
212header-y += ivtvfb.h
108header-y += ixjuser.h 213header-y += ixjuser.h
109header-y += jffs2.h 214header-y += jffs2.h
215header-y += joystick.h
216header-y += kd.h
217header-y += kdev_t.h
218header-y += kernel.h
219header-y += kernelcapi.h
220header-y += keyboard.h
110header-y += keyctl.h 221header-y += keyctl.h
222header-y += l2tp.h
111header-y += limits.h 223header-y += limits.h
224header-y += llc.h
225header-y += loop.h
226header-y += lp.h
112header-y += magic.h 227header-y += magic.h
113header-y += major.h 228header-y += major.h
114header-y += map_to_7segment.h 229header-y += map_to_7segment.h
115header-y += matroxfb.h 230header-y += matroxfb.h
231header-y += mempolicy.h
116header-y += meye.h 232header-y += meye.h
233header-y += mii.h
117header-y += minix_fs.h 234header-y += minix_fs.h
235header-y += mman.h
118header-y += mmtimer.h 236header-y += mmtimer.h
119header-y += mqueue.h 237header-y += mqueue.h
238header-y += mroute.h
239header-y += mroute6.h
240header-y += msdos_fs.h
241header-y += msg.h
120header-y += mtio.h 242header-y += mtio.h
243header-y += n_r3964.h
244header-y += nbd.h
245header-y += ncp.h
246header-y += ncp_fs.h
247header-y += ncp_mount.h
121header-y += ncp_no.h 248header-y += ncp_no.h
122header-y += neighbour.h 249header-y += neighbour.h
250header-y += net.h
123header-y += net_dropmon.h 251header-y += net_dropmon.h
124header-y += net_tstamp.h 252header-y += net_tstamp.h
253header-y += netdevice.h
254header-y += netfilter.h
125header-y += netfilter_arp.h 255header-y += netfilter_arp.h
256header-y += netfilter_bridge.h
257header-y += netfilter_decnet.h
258header-y += netfilter_ipv4.h
259header-y += netfilter_ipv6.h
260header-y += netlink.h
126header-y += netrom.h 261header-y += netrom.h
262header-y += nfs.h
127header-y += nfs2.h 263header-y += nfs2.h
264header-y += nfs3.h
265header-y += nfs4.h
128header-y += nfs4_mount.h 266header-y += nfs4_mount.h
267header-y += nfs_fs.h
268header-y += nfs_idmap.h
129header-y += nfs_mount.h 269header-y += nfs_mount.h
270header-y += nfsacl.h
130header-y += nl80211.h 271header-y += nl80211.h
272header-y += nubus.h
273header-y += nvram.h
131header-y += omapfb.h 274header-y += omapfb.h
275header-y += oom.h
132header-y += param.h 276header-y += param.h
277header-y += parport.h
278header-y += patchkey.h
279header-y += pci.h
133header-y += pci_regs.h 280header-y += pci_regs.h
134header-y += perf_event.h 281header-y += perf_event.h
282header-y += personality.h
135header-y += pfkeyv2.h 283header-y += pfkeyv2.h
136header-y += pg.h 284header-y += pg.h
137header-y += phantom.h 285header-y += phantom.h
138header-y += phonet.h 286header-y += phonet.h
139header-y += pkt_cls.h 287header-y += pkt_cls.h
140header-y += pkt_sched.h 288header-y += pkt_sched.h
289header-y += pktcdvd.h
290header-y += pmu.h
291header-y += poll.h
141header-y += posix_types.h 292header-y += posix_types.h
142header-y += ppdev.h 293header-y += ppdev.h
294header-y += ppp-comp.h
295header-y += ppp_defs.h
296header-y += pps.h
143header-y += prctl.h 297header-y += prctl.h
144header-y += qnxtypes.h 298header-y += ptrace.h
145header-y += qnx4_fs.h 299header-y += qnx4_fs.h
300header-y += qnxtypes.h
301header-y += quota.h
146header-y += radeonfb.h 302header-y += radeonfb.h
303header-y += random.h
147header-y += raw.h 304header-y += raw.h
305header-y += reboot.h
306header-y += reiserfs_fs.h
307header-y += reiserfs_xattr.h
148header-y += resource.h 308header-y += resource.h
309header-y += rfkill.h
149header-y += romfs_fs.h 310header-y += romfs_fs.h
150header-y += rose.h 311header-y += rose.h
312header-y += route.h
313header-y += rtc.h
314header-y += rtnetlink.h
315header-y += scc.h
316header-y += sched.h
317header-y += screen_info.h
318header-y += sdla.h
319header-y += securebits.h
320header-y += selinux_netlink.h
321header-y += sem.h
322header-y += serial.h
323header-y += serial_core.h
151header-y += serial_reg.h 324header-y += serial_reg.h
325header-y += serio.h
326header-y += shm.h
327header-y += signal.h
328header-y += signalfd.h
329header-y += smb.h
330header-y += smb_fs.h
331header-y += smb_mount.h
152header-y += smbno.h 332header-y += smbno.h
153header-y += snmp.h 333header-y += snmp.h
334header-y += socket.h
154header-y += sockios.h 335header-y += sockios.h
155header-y += som.h 336header-y += som.h
337header-y += sonet.h
338header-y += sonypi.h
156header-y += sound.h 339header-y += sound.h
340header-y += soundcard.h
341header-y += stat.h
342header-y += stddef.h
343header-y += string.h
157header-y += suspend_ioctls.h 344header-y += suspend_ioctls.h
345header-y += swab.h
346header-y += synclink.h
347header-y += sysctl.h
158header-y += taskstats.h 348header-y += taskstats.h
349header-y += tcp.h
159header-y += telephony.h 350header-y += telephony.h
160header-y += termios.h 351header-y += termios.h
352header-y += time.h
161header-y += times.h 353header-y += times.h
354header-y += timex.h
162header-y += tiocl.h 355header-y += tiocl.h
163header-y += tipc.h 356header-y += tipc.h
164header-y += tipc_config.h 357header-y += tipc_config.h
165header-y += toshiba.h 358header-y += toshiba.h
359header-y += tty.h
360header-y += types.h
166header-y += udf_fs_i.h 361header-y += udf_fs_i.h
362header-y += udp.h
363header-y += uinput.h
364header-y += uio.h
167header-y += ultrasound.h 365header-y += ultrasound.h
168header-y += un.h 366header-y += un.h
367header-y += unistd.h
368header-y += usbdevice_fs.h
169header-y += utime.h 369header-y += utime.h
370header-y += utsname.h
170header-y += veth.h 371header-y += veth.h
372header-y += vhost.h
373header-y += videodev.h
374header-y += videodev2.h
171header-y += videotext.h 375header-y += videotext.h
172header-y += x25.h 376header-y += virtio_9p.h
173 377header-y += virtio_balloon.h
174unifdef-y += acct.h 378header-y += virtio_blk.h
175unifdef-y += adb.h 379header-y += virtio_config.h
176unifdef-y += adfs_fs.h 380header-y += virtio_console.h
177unifdef-y += agpgart.h 381header-y += virtio_ids.h
178ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \ 382header-y += virtio_net.h
179 $(srctree)/include/asm-$(SRCARCH)/a.out.h),) 383header-y += virtio_pci.h
180unifdef-y += a.out.h 384header-y += virtio_ring.h
181endif 385header-y += virtio_rng.h
182unifdef-y += apm_bios.h 386header-y += vt.h
183unifdef-y += atalk.h 387header-y += wait.h
184unifdef-y += atmdev.h 388header-y += wanrouter.h
185unifdef-y += atm.h 389header-y += watchdog.h
186unifdef-y += atm_tcp.h
187unifdef-y += audit.h
188unifdef-y += auto_fs.h
189unifdef-y += auxvec.h
190unifdef-y += binfmts.h
191unifdef-y += blktrace_api.h
192unifdef-y += capability.h
193unifdef-y += capi.h
194unifdef-y += cciss_ioctl.h
195unifdef-y += cdrom.h
196unifdef-y += cm4000_cs.h
197unifdef-y += cn_proc.h
198unifdef-y += coda.h
199unifdef-y += connector.h
200unifdef-y += cuda.h
201unifdef-y += cyclades.h
202unifdef-y += dccp.h
203unifdef-y += dlm.h
204unifdef-y += dlm_plock.h
205unifdef-y += edd.h
206unifdef-y += elf.h
207unifdef-y += elfcore.h
208unifdef-y += errno.h
209unifdef-y += errqueue.h
210unifdef-y += ethtool.h
211unifdef-y += eventpoll.h
212unifdef-y += signalfd.h
213unifdef-y += ext2_fs.h
214unifdef-y += fanotify.h
215unifdef-y += fb.h
216unifdef-y += fcntl.h
217unifdef-y += filter.h
218unifdef-y += flat.h
219unifdef-y += futex.h
220unifdef-y += fs.h
221unifdef-y += gameport.h
222unifdef-y += generic_serial.h
223unifdef-y += hdlcdrv.h
224unifdef-y += hdlc.h
225unifdef-y += hdreg.h
226unifdef-y += hid.h
227unifdef-y += hiddev.h
228unifdef-y += hidraw.h
229unifdef-y += hpet.h
230unifdef-y += i2c.h
231unifdef-y += i2c-dev.h
232unifdef-y += icmp.h
233unifdef-y += icmpv6.h
234unifdef-y += if_addr.h
235unifdef-y += if_arp.h
236unifdef-y += if_bridge.h
237unifdef-y += if_ec.h
238unifdef-y += if_eql.h
239unifdef-y += if_ether.h
240unifdef-y += if_fddi.h
241unifdef-y += if_frad.h
242unifdef-y += if_ltalk.h
243unifdef-y += if_link.h
244unifdef-y += if_phonet.h
245unifdef-y += if_pppol2tp.h
246unifdef-y += if_pppox.h
247unifdef-y += if_tr.h
248unifdef-y += if_tunnel.h
249unifdef-y += if_vlan.h
250unifdef-y += igmp.h
251unifdef-y += inet_diag.h
252unifdef-y += in.h
253unifdef-y += in6.h
254unifdef-y += inotify.h
255unifdef-y += input.h
256unifdef-y += ip.h
257unifdef-y += ipc.h
258unifdef-y += ipmi.h
259unifdef-y += ipv6.h
260unifdef-y += ipv6_route.h
261unifdef-y += isdn.h
262unifdef-y += isdnif.h
263unifdef-y += isdn_divertif.h
264unifdef-y += isdn_ppp.h
265unifdef-y += ivtv.h
266unifdef-y += ivtvfb.h
267unifdef-y += joystick.h
268unifdef-y += kdev_t.h
269unifdef-y += kd.h
270unifdef-y += kernelcapi.h
271unifdef-y += kernel.h
272unifdef-y += keyboard.h
273ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm.h \
274 $(srctree)/include/asm-$(SRCARCH)/kvm.h),)
275unifdef-y += kvm.h
276endif
277ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/kvm_para.h \
278 $(srctree)/include/asm-$(SRCARCH)/kvm_para.h),)
279unifdef-y += kvm_para.h
280endif
281unifdef-y += l2tp.h
282unifdef-y += llc.h
283unifdef-y += loop.h
284unifdef-y += lp.h
285unifdef-y += mempolicy.h
286unifdef-y += mii.h
287unifdef-y += mman.h
288unifdef-y += mroute.h
289unifdef-y += mroute6.h
290unifdef-y += msdos_fs.h
291unifdef-y += msg.h
292unifdef-y += nbd.h
293unifdef-y += ncp_fs.h
294unifdef-y += ncp.h
295unifdef-y += ncp_mount.h
296unifdef-y += netdevice.h
297unifdef-y += netfilter_bridge.h
298unifdef-y += netfilter_decnet.h
299unifdef-y += netfilter.h
300unifdef-y += netfilter_ipv4.h
301unifdef-y += netfilter_ipv6.h
302unifdef-y += net.h
303unifdef-y += netlink.h
304unifdef-y += nfs3.h
305unifdef-y += nfs4.h
306unifdef-y += nfsacl.h
307unifdef-y += nfs_fs.h
308unifdef-y += nfs.h
309unifdef-y += nfs_idmap.h
310unifdef-y += n_r3964.h
311unifdef-y += nubus.h
312unifdef-y += nvram.h
313unifdef-y += oom.h
314unifdef-y += parport.h
315unifdef-y += patchkey.h
316unifdef-y += pci.h
317unifdef-y += personality.h
318unifdef-y += pktcdvd.h
319unifdef-y += pmu.h
320unifdef-y += poll.h
321unifdef-y += ppp_defs.h
322unifdef-y += ppp-comp.h
323unifdef-y += pps.h
324unifdef-y += ptrace.h
325unifdef-y += quota.h
326unifdef-y += random.h
327unifdef-y += rfkill.h
328unifdef-y += irqnr.h
329unifdef-y += reboot.h
330unifdef-y += reiserfs_fs.h
331unifdef-y += reiserfs_xattr.h
332unifdef-y += route.h
333unifdef-y += rtc.h
334unifdef-y += rtnetlink.h
335unifdef-y += scc.h
336unifdef-y += sched.h
337unifdef-y += screen_info.h
338unifdef-y += sdla.h
339unifdef-y += securebits.h
340unifdef-y += selinux_netlink.h
341unifdef-y += sem.h
342unifdef-y += serial_core.h
343unifdef-y += serial.h
344unifdef-y += serio.h
345unifdef-y += shm.h
346unifdef-y += signal.h
347unifdef-y += smb_fs.h
348unifdef-y += smb.h
349unifdef-y += smb_mount.h
350unifdef-y += socket.h
351unifdef-y += sonet.h
352unifdef-y += sonypi.h
353unifdef-y += soundcard.h
354unifdef-y += stat.h
355unifdef-y += stddef.h
356unifdef-y += string.h
357unifdef-y += swab.h
358unifdef-y += synclink.h
359unifdef-y += sysctl.h
360unifdef-y += tcp.h
361unifdef-y += time.h
362unifdef-y += timex.h
363unifdef-y += tty.h
364unifdef-y += types.h
365unifdef-y += udp.h
366unifdef-y += uinput.h
367unifdef-y += uio.h
368unifdef-y += unistd.h
369unifdef-y += usbdevice_fs.h
370unifdef-y += utsname.h
371unifdef-y += vhost.h
372unifdef-y += videodev2.h
373unifdef-y += videodev.h
374unifdef-y += virtio_config.h
375unifdef-y += virtio_ids.h
376unifdef-y += virtio_blk.h
377unifdef-y += virtio_net.h
378unifdef-y += virtio_9p.h
379unifdef-y += virtio_balloon.h
380unifdef-y += virtio_console.h
381unifdef-y += virtio_pci.h
382unifdef-y += virtio_ring.h
383unifdef-y += virtio_rng.h
384unifdef-y += vt.h
385unifdef-y += wait.h
386unifdef-y += wanrouter.h
387unifdef-y += watchdog.h
388unifdef-y += wireless.h
389unifdef-y += xattr.h
390unifdef-y += xfrm.h
391
392objhdr-y += version.h
393header-y += wimax.h 390header-y += wimax.h
394header-y += wimax/ 391header-y += wireless.h
392header-y += x25.h
393header-y += xattr.h
394header-y += xfrm.h
diff --git a/include/linux/byteorder/Kbuild b/include/linux/byteorder/Kbuild
index 38437225b092..5896e344ba6c 100644
--- a/include/linux/byteorder/Kbuild
+++ b/include/linux/byteorder/Kbuild
@@ -1,2 +1,2 @@
1unifdef-y += big_endian.h 1header-y += big_endian.h
2unifdef-y += little_endian.h 2header-y += little_endian.h
diff --git a/include/linux/dvb/Kbuild b/include/linux/dvb/Kbuild
index d97b3a51e227..f4dba8637f98 100644
--- a/include/linux/dvb/Kbuild
+++ b/include/linux/dvb/Kbuild
@@ -1,9 +1,8 @@
1header-y += audio.h
1header-y += ca.h 2header-y += ca.h
3header-y += dmx.h
2header-y += frontend.h 4header-y += frontend.h
3header-y += net.h 5header-y += net.h
4header-y += osd.h 6header-y += osd.h
5header-y += version.h 7header-y += version.h
6 8header-y += video.h
7unifdef-y += audio.h
8unifdef-y += dmx.h
9unifdef-y += video.h
diff --git a/include/linux/netfilter/Kbuild b/include/linux/netfilter/Kbuild
index edeeabdc1500..9d40effe7ca7 100644
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
@@ -1,8 +1,14 @@
1header-y += nf_conntrack_common.h
2header-y += nf_conntrack_ftp.h
1header-y += nf_conntrack_sctp.h 3header-y += nf_conntrack_sctp.h
4header-y += nf_conntrack_tcp.h
2header-y += nf_conntrack_tuple_common.h 5header-y += nf_conntrack_tuple_common.h
6header-y += nfnetlink.h
7header-y += nfnetlink_compat.h
3header-y += nfnetlink_conntrack.h 8header-y += nfnetlink_conntrack.h
4header-y += nfnetlink_log.h 9header-y += nfnetlink_log.h
5header-y += nfnetlink_queue.h 10header-y += nfnetlink_queue.h
11header-y += x_tables.h
6header-y += xt_CHECKSUM.h 12header-y += xt_CHECKSUM.h
7header-y += xt_CLASSIFY.h 13header-y += xt_CLASSIFY.h
8header-y += xt_CONNMARK.h 14header-y += xt_CONNMARK.h
@@ -31,9 +37,9 @@ header-y += xt_dccp.h
31header-y += xt_dscp.h 37header-y += xt_dscp.h
32header-y += xt_esp.h 38header-y += xt_esp.h
33header-y += xt_hashlimit.h 39header-y += xt_hashlimit.h
40header-y += xt_helper.h
34header-y += xt_iprange.h 41header-y += xt_iprange.h
35header-y += xt_ipvs.h 42header-y += xt_ipvs.h
36header-y += xt_helper.h
37header-y += xt_length.h 43header-y += xt_length.h
38header-y += xt_limit.h 44header-y += xt_limit.h
39header-y += xt_mac.h 45header-y += xt_mac.h
@@ -41,7 +47,9 @@ header-y += xt_mark.h
41header-y += xt_multiport.h 47header-y += xt_multiport.h
42header-y += xt_osf.h 48header-y += xt_osf.h
43header-y += xt_owner.h 49header-y += xt_owner.h
50header-y += xt_physdev.h
44header-y += xt_pkttype.h 51header-y += xt_pkttype.h
52header-y += xt_policy.h
45header-y += xt_quota.h 53header-y += xt_quota.h
46header-y += xt_rateest.h 54header-y += xt_rateest.h
47header-y += xt_realm.h 55header-y += xt_realm.h
@@ -54,12 +62,3 @@ header-y += xt_tcpmss.h
54header-y += xt_tcpudp.h 62header-y += xt_tcpudp.h
55header-y += xt_time.h 63header-y += xt_time.h
56header-y += xt_u32.h 64header-y += xt_u32.h
57
58unifdef-y += nf_conntrack_common.h
59unifdef-y += nf_conntrack_ftp.h
60unifdef-y += nf_conntrack_tcp.h
61unifdef-y += nfnetlink.h
62unifdef-y += nfnetlink_compat.h
63unifdef-y += x_tables.h
64unifdef-y += xt_physdev.h
65unifdef-y += xt_policy.h
diff --git a/include/linux/netfilter_arp/Kbuild b/include/linux/netfilter_arp/Kbuild
index 4f13dfcb92ea..b27439c71037 100644
--- a/include/linux/netfilter_arp/Kbuild
+++ b/include/linux/netfilter_arp/Kbuild
@@ -1,3 +1,2 @@
1header-y += arp_tables.h
1header-y += arpt_mangle.h 2header-y += arpt_mangle.h
2
3unifdef-y += arp_tables.h
diff --git a/include/linux/netfilter_bridge/Kbuild b/include/linux/netfilter_bridge/Kbuild
index 76ff4c47d8c4..d4d78672873e 100644
--- a/include/linux/netfilter_bridge/Kbuild
+++ b/include/linux/netfilter_bridge/Kbuild
@@ -1,3 +1,4 @@
1header-y += ebt_802_3.h
1header-y += ebt_among.h 2header-y += ebt_among.h
2header-y += ebt_arp.h 3header-y += ebt_arp.h
3header-y += ebt_arpreply.h 4header-y += ebt_arpreply.h
@@ -12,6 +13,4 @@ header-y += ebt_redirect.h
12header-y += ebt_stp.h 13header-y += ebt_stp.h
13header-y += ebt_ulog.h 14header-y += ebt_ulog.h
14header-y += ebt_vlan.h 15header-y += ebt_vlan.h
15 16header-y += ebtables.h
16unifdef-y += ebtables.h
17unifdef-y += ebt_802_3.h
diff --git a/include/linux/netfilter_ipv4/Kbuild b/include/linux/netfilter_ipv4/Kbuild
index 431b40761920..f9930c87fff3 100644
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
@@ -1,3 +1,5 @@
1header-y += ip_queue.h
2header-y += ip_tables.h
1header-y += ipt_CLUSTERIP.h 3header-y += ipt_CLUSTERIP.h
2header-y += ipt_ECN.h 4header-y += ipt_ECN.h
3header-y += ipt_LOG.h 5header-y += ipt_LOG.h
@@ -10,6 +12,3 @@ header-y += ipt_ah.h
10header-y += ipt_ecn.h 12header-y += ipt_ecn.h
11header-y += ipt_realm.h 13header-y += ipt_realm.h
12header-y += ipt_ttl.h 14header-y += ipt_ttl.h
13
14unifdef-y += ip_queue.h
15unifdef-y += ip_tables.h
diff --git a/include/linux/netfilter_ipv6/Kbuild b/include/linux/netfilter_ipv6/Kbuild
index e864eaee9e5e..bd095bc075e9 100644
--- a/include/linux/netfilter_ipv6/Kbuild
+++ b/include/linux/netfilter_ipv6/Kbuild
@@ -1,12 +1,11 @@
1header-y += ip6_tables.h
1header-y += ip6t_HL.h 2header-y += ip6t_HL.h
2header-y += ip6t_LOG.h 3header-y += ip6t_LOG.h
3header-y += ip6t_REJECT.h 4header-y += ip6t_REJECT.h
4header-y += ip6t_ah.h 5header-y += ip6t_ah.h
5header-y += ip6t_frag.h 6header-y += ip6t_frag.h
6header-y += ip6t_ipv6header.h
7header-y += ip6t_hl.h 7header-y += ip6t_hl.h
8header-y += ip6t_ipv6header.h
8header-y += ip6t_mh.h 9header-y += ip6t_mh.h
9header-y += ip6t_opts.h 10header-y += ip6t_opts.h
10header-y += ip6t_rt.h 11header-y += ip6t_rt.h
11
12unifdef-y += ip6_tables.h
diff --git a/include/linux/nfsd/Kbuild b/include/linux/nfsd/Kbuild
index fc972048e572..55d1467de3c1 100644
--- a/include/linux/nfsd/Kbuild
+++ b/include/linux/nfsd/Kbuild
@@ -1,6 +1,6 @@
1unifdef-y += const.h 1header-y += const.h
2unifdef-y += debug.h 2header-y += debug.h
3unifdef-y += export.h 3header-y += export.h
4unifdef-y += nfsfh.h 4header-y += nfsfh.h
5unifdef-y += stats.h 5header-y += stats.h
6unifdef-y += syscall.h 6header-y += syscall.h
diff --git a/include/linux/sunrpc/Kbuild b/include/linux/sunrpc/Kbuild
index fb438f158eee..98df21164a86 100644
--- a/include/linux/sunrpc/Kbuild
+++ b/include/linux/sunrpc/Kbuild
@@ -1 +1 @@
unifdef-y += debug.h header-y += debug.h
diff --git a/include/sound/Kbuild b/include/sound/Kbuild
index e9dd9369ecb9..802947f60915 100644
--- a/include/sound/Kbuild
+++ b/include/sound/Kbuild
@@ -1,9 +1,8 @@
1header-y += asequencer.h
2header-y += asound.h
1header-y += asound_fm.h 3header-y += asound_fm.h
4header-y += emu10k1.h
2header-y += hdsp.h 5header-y += hdsp.h
3header-y += hdspm.h 6header-y += hdspm.h
7header-y += sb16_csp.h
4header-y += sfnt_info.h 8header-y += sfnt_info.h
5
6unifdef-y += asequencer.h
7unifdef-y += asound.h
8unifdef-y += emu10k1.h
9unifdef-y += sb16_csp.h
diff --git a/include/video/Kbuild b/include/video/Kbuild
index 0e406f730c2f..ad3e622c5339 100644
--- a/include/video/Kbuild
+++ b/include/video/Kbuild
@@ -1,2 +1,3 @@
1unifdef-y += sisfb.h uvesafb.h 1header-y += edid.h
2unifdef-y += edid.h 2header-y += sisfb.h
3header-y += uvesafb.h