aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/Kbuild
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-25 12:26:59 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-25 12:26:59 -0400
commit363e065c02b1273364d5356711a83e7f548fc0c8 (patch)
tree0df0e65da403ade33ade580c2770c97437b1b1af /include/linux/Kbuild
parent907b9bceb41fa46beae93f79cc4a2247df502c0f (diff)
parent7c250413e5b7c3dfae89354725b70c76d7621395 (diff)
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with Linus' latest kernel. This will hopefully allow GFS2 to be more easily merged into forthcoming -mm and FC kernels due to the "one line per header" format now used for the kernel headers. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com> Conflicts: include/linux/Kbuild include/linux/kernel.h
Diffstat (limited to 'include/linux/Kbuild')
-rw-r--r--include/linux/Kbuild403
1 files changed, 342 insertions, 61 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index d8e720f9c21a..4811ca5cdc92 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -1,64 +1,345 @@
1header-y := byteorder/ dvb/ hdlc/ isdn/ nfsd/ raid/ sunrpc/ tc_act/ \ 1header-y += byteorder/
2 netfilter/ netfilter_arp/ netfilter_bridge/ netfilter_ipv4/ \ 2header-y += dvb/
3 netfilter_ipv6/ 3header-y += hdlc/
4header-y += isdn/
5header-y += nfsd/
6header-y += raid/
7header-y += sunrpc/
8header-y += tc_act/
9header-y += netfilter/
10header-y += netfilter_arp/
11header-y += netfilter_bridge/
12header-y += netfilter_ipv4/
13header-y += netfilter_ipv6/
4 14
5header-y += affs_fs.h affs_hardblocks.h aio_abi.h a.out.h arcfb.h \ 15header-y += affs_hardblocks.h
6 atmapi.h atmbr2684.h atmclip.h atm_eni.h atm_he.h \ 16header-y += aio_abi.h
7 atm_idt77105.h atmioc.h atmlec.h atmmpc.h atm_nicstar.h \ 17header-y += a.out.h
8 atmppp.h atmsap.h atmsvc.h atm_zatm.h auto_fs4.h auxvec.h \ 18header-y += arcfb.h
9 awe_voice.h ax25.h b1lli.h baycom.h bfs_fs.h blkpg.h \ 19header-y += atmapi.h
10 bpqether.h cdk.h chio.h coda_psdev.h coff.h comstats.h \ 20header-y += atmbr2684.h
11 consolemap.h cycx_cfm.h dlm_device.h dm-ioctl.h dn.h dqblk_v1.h \ 21header-y += atmclip.h
12 dqblk_v2.h dqblk_xfs.h efs_fs_sb.h elf-fdpic.h elf.h elf-em.h \ 22header-y += atm_eni.h
13 fadvise.h fd.h fdreg.h ftape-header-segment.h ftape-vendors.h \ 23header-y += atm_he.h
14 fuse.h futex.h genetlink.h gen_stats.h gigaset_dev.h hdsmart.h \ 24header-y += atm_idt77105.h
15 hpfs_fs.h hysdn_if.h i2c-dev.h i8k.h icmp.h \ 25header-y += atmioc.h
16 if_arcnet.h if_arp.h if_bonding.h if_cablemodem.h if_fc.h \ 26header-y += atmlec.h
17 if_fddi.h if.h if_hippi.h if_infiniband.h if_packet.h \ 27header-y += atmmpc.h
18 if_plip.h if_ppp.h if_slip.h if_strip.h if_tunnel.h in6.h \ 28header-y += atm_nicstar.h
19 in_route.h ioctl.h ip.h ipmi_msgdefs.h ip_mp_alg.h ipsec.h \ 29header-y += atmppp.h
20 ipx.h irda.h isdn_divertif.h iso_fs.h ite_gpio.h ixjuser.h \ 30header-y += atmsap.h
21 jffs2.h keyctl.h limits.h lock_dlm_plock.h major.h matroxfb.h \ 31header-y += atmsvc.h
22 meye.h minix_fs.h mmtimer.h mqueue.h mtio.h ncp_no.h \ 32header-y += atm_zatm.h
23 netfilter_arp.h netrom.h nfs2.h nfs4_mount.h nfs_mount.h \ 33header-y += auto_fs4.h
24 openprom_fs.h param.h pci_ids.h pci_regs.h personality.h \ 34header-y += auxvec.h
25 pfkeyv2.h pg.h pkt_cls.h pkt_sched.h posix_types.h ppdev.h \ 35header-y += awe_voice.h
26 prctl.h ps2esdi.h qic117.h qnxtypes.h quotaio_v1.h quotaio_v2.h \ 36header-y += ax25.h
27 radeonfb.h raw.h resource.h rose.h sctp.h smbno.h snmp.h \ 37header-y += b1lli.h
28 sockios.h som.h sound.h stddef.h synclink.h telephony.h \ 38header-y += baycom.h
29 termios.h ticable.h times.h tiocl.h tipc.h toshiba.h \ 39header-y += bfs_fs.h
30 ultrasound.h un.h utime.h utsname.h video_decoder.h \ 40header-y += blkpg.h
31 video_encoder.h videotext.h vt.h wavefront.h wireless.h xattr.h \ 41header-y += bpqether.h
32 x25.h zorro_ids.h 42header-y += cdk.h
43header-y += chio.h
44header-y += coda_psdev.h
45header-y += coff.h
46header-y += comstats.h
47header-y += consolemap.h
48header-y += cycx_cfm.h
49header-y += dlm_device.h
50header-y += dm-ioctl.h
51header-y += dn.h
52header-y += dqblk_v1.h
53header-y += dqblk_v2.h
54header-y += dqblk_xfs.h
55header-y += efs_fs_sb.h
56header-y += elf-fdpic.h
57header-y += elf.h
58header-y += elf-em.h
59header-y += fadvise.h
60header-y += fd.h
61header-y += fdreg.h
62header-y += ftape-header-segment.h
63header-y += ftape-vendors.h
64header-y += fuse.h
65header-y += futex.h
66header-y += genetlink.h
67header-y += gen_stats.h
68header-y += gigaset_dev.h
69header-y += hdsmart.h
70header-y += hysdn_if.h
71header-y += i2c-dev.h
72header-y += i8k.h
73header-y += icmp.h
74header-y += if_arcnet.h
75header-y += if_arp.h
76header-y += if_bonding.h
77header-y += if_cablemodem.h
78header-y += if_fc.h
79header-y += if_fddi.h
80header-y += if.h
81header-y += if_hippi.h
82header-y += if_infiniband.h
83header-y += if_packet.h
84header-y += if_plip.h
85header-y += if_ppp.h
86header-y += if_slip.h
87header-y += if_strip.h
88header-y += if_tunnel.h
89header-y += in6.h
90header-y += in_route.h
91header-y += ioctl.h
92header-y += ip.h
93header-y += ipmi_msgdefs.h
94header-y += ip_mp_alg.h
95header-y += ipsec.h
96header-y += ipx.h
97header-y += irda.h
98header-y += isdn_divertif.h
99header-y += iso_fs.h
100header-y += ite_gpio.h
101header-y += ixjuser.h
102header-y += jffs2.h
103header-y += keyctl.h
104header-y += limits.h
105header-y += lock_dlm_plock.h
106header-y += magic.h
107header-y += major.h
108header-y += matroxfb.h
109header-y += meye.h
110header-y += minix_fs.h
111header-y += mmtimer.h
112header-y += mqueue.h
113header-y += mtio.h
114header-y += ncp_no.h
115header-y += netfilter_arp.h
116header-y += netrom.h
117header-y += nfs2.h
118header-y += nfs4_mount.h
119header-y += nfs_mount.h
120header-y += param.h
121header-y += pci_ids.h
122header-y += pci_regs.h
123header-y += personality.h
124header-y += pfkeyv2.h
125header-y += pg.h
126header-y += pkt_cls.h
127header-y += pkt_sched.h
128header-y += posix_types.h
129header-y += ppdev.h
130header-y += prctl.h
131header-y += ps2esdi.h
132header-y += qic117.h
133header-y += qnxtypes.h
134header-y += quotaio_v1.h
135header-y += quotaio_v2.h
136header-y += radeonfb.h
137header-y += raw.h
138header-y += resource.h
139header-y += rose.h
140header-y += sctp.h
141header-y += smbno.h
142header-y += snmp.h
143header-y += sockios.h
144header-y += som.h
145header-y += sound.h
146header-y += synclink.h
147header-y += telephony.h
148header-y += termios.h
149header-y += ticable.h
150header-y += times.h
151header-y += tiocl.h
152header-y += tipc.h
153header-y += toshiba.h
154header-y += ultrasound.h
155header-y += un.h
156header-y += utime.h
157header-y += utsname.h
158header-y += video_decoder.h
159header-y += video_encoder.h
160header-y += videotext.h
161header-y += vt.h
162header-y += wavefront.h
163header-y += wireless.h
164header-y += xattr.h
165header-y += x25.h
166header-y += zorro_ids.h
33 167
34unifdef-y += acct.h adb.h adfs_fs.h agpgart.h apm_bios.h atalk.h \ 168unifdef-y += acct.h
35 atmarp.h atmdev.h atm.h atm_tcp.h audit.h auto_fs.h binfmts.h \ 169unifdef-y += adb.h
36 capability.h capi.h cciss_ioctl.h cdrom.h cm4000_cs.h \ 170unifdef-y += adfs_fs.h
37 cn_proc.h coda.h connector.h cramfs_fs.h cuda.h cyclades.h \ 171unifdef-y += agpgart.h
38 dccp.h dirent.h divert.h dlm.h elfcore.h errno.h errqueue.h \ 172unifdef-y += apm_bios.h
39 ethtool.h eventpoll.h ext2_fs.h ext3_fs.h fb.h fcntl.h \ 173unifdef-y += atalk.h
40 filter.h flat.h fs.h ftape.h gameport.h generic_serial.h \ 174unifdef-y += atmarp.h
41 genhd.h gfs2_ondisk.h hayesesp.h hdlcdrv.h hdlc.h hdreg.h \ 175unifdef-y += atmdev.h
42 hiddev.h hpet.h i2c.h i2o-dev.h icmpv6.h iflags.h if_bridge.h \ 176unifdef-y += atm.h
43 if_ec.h if_eql.h if_ether.h if_frad.h if_ltalk.h if_pppox.h \ 177unifdef-y += atm_tcp.h
44 if_shaper.h if_tr.h if_tun.h if_vlan.h if_wanpipe.h igmp.h \ 178unifdef-y += audit.h
45 inet_diag.h in.h inotify.h input.h ipc.h ipmi.h ipv6.h \ 179unifdef-y += auto_fs.h
46 ipv6_route.h isdn.h isdnif.h isdn_ppp.h isicom.h jbd.h \ 180unifdef-y += binfmts.h
47 joystick.h kdev_t.h kd.h kernelcapi.h kernel.h keyboard.h \ 181unifdef-y += capability.h
48 llc.h lm_interface.h loop.h lp.h mempolicy.h mii.h mman.h \ 182unifdef-y += capi.h
49 mroute.h msdos_fs.h msg.h nbd.h ncp_fs.h ncp.h ncp_mount.h \ 183unifdef-y += cciss_ioctl.h
50 netdevice.h netfilter_bridge.h netfilter_decnet.h netfilter.h \ 184unifdef-y += cdrom.h
51 netfilter_ipv4.h netfilter_ipv6.h netfilter_logging.h net.h \ 185unifdef-y += cm4000_cs.h
52 netlink.h nfs3.h nfs4.h nfsacl.h nfs_fs.h nfs.h nfs_idmap.h \ 186unifdef-y += cn_proc.h
53 n_r3964.h nubus.h nvram.h parport.h patchkey.h pci.h pktcdvd.h \ 187unifdef-y += coda.h
54 pmu.h poll.h ppp_defs.h ppp-comp.h ptrace.h qnx4_fs.h quota.h \ 188unifdef-y += connector.h
55 random.h reboot.h reiserfs_fs.h reiserfs_xattr.h romfs_fs.h \ 189unifdef-y += cramfs_fs.h
56 route.h rtc.h rtnetlink.h scc.h sched.h sdla.h \ 190unifdef-y += cuda.h
57 selinux_netlink.h sem.h serial_core.h serial.h serio.h shm.h \ 191unifdef-y += cyclades.h
58 signal.h smb_fs.h smb.h smb_mount.h socket.h sonet.h sonypi.h \ 192unifdef-y += dccp.h
59 soundcard.h stat.h sysctl.h tcp.h time.h timex.h tty.h types.h \ 193unifdef-y += dirent.h
60 udf_fs_i.h udp.h uinput.h uio.h unistd.h usb_ch9.h \ 194unifdef-y += divert.h
61 usbdevice_fs.h user.h videodev2.h videodev.h wait.h \ 195unifdef-y += dlm.h
62 wanrouter.h watchdog.h xfrm.h zftape.h 196unifdef-y += elfcore.h
197unifdef-y += errno.h
198unifdef-y += errqueue.h
199unifdef-y += ethtool.h
200unifdef-y += eventpoll.h
201unifdef-y += ext2_fs.h
202unifdef-y += ext3_fs.h
203unifdef-y += fb.h
204unifdef-y += fcntl.h
205unifdef-y += filter.h
206unifdef-y += flat.h
207unifdef-y += fs.h
208unifdef-y += ftape.h
209unifdef-y += gameport.h
210unifdef-y += generic_serial.h
211unifdef-y += genhd.h
212unifdef-y += gfs2_ondisk.h
213unifdef-y += hayesesp.h
214unifdef-y += hdlcdrv.h
215unifdef-y += hdlc.h
216unifdef-y += hdreg.h
217unifdef-y += hiddev.h
218unifdef-y += hpet.h
219unifdef-y += i2c.h
220unifdef-y += i2o-dev.h
221unifdef-y += icmpv6.h
222unifdef-y += iflags.h
223unifdef-y += if_bridge.h
224unifdef-y += if_ec.h
225unifdef-y += if_eql.h
226unifdef-y += if_ether.h
227unifdef-y += if_frad.h
228unifdef-y += if_ltalk.h
229unifdef-y += if_pppox.h
230unifdef-y += if_shaper.h
231unifdef-y += if_tr.h
232unifdef-y += if_tun.h
233unifdef-y += if_vlan.h
234unifdef-y += if_wanpipe.h
235unifdef-y += igmp.h
236unifdef-y += inet_diag.h
237unifdef-y += in.h
238unifdef-y += inotify.h
239unifdef-y += input.h
240unifdef-y += ipc.h
241unifdef-y += ipmi.h
242unifdef-y += ipv6.h
243unifdef-y += ipv6_route.h
244unifdef-y += isdn.h
245unifdef-y += isdnif.h
246unifdef-y += isdn_ppp.h
247unifdef-y += isicom.h
248unifdef-y += jbd.h
249unifdef-y += joystick.h
250unifdef-y += kdev_t.h
251unifdef-y += kd.h
252unifdef-y += kernelcapi.h
253unifdef-y += kernel.h
254unifdef-y += keyboard.h
255unifdef-y += llc.h
256unifdef-y += loop.h
257unifdef-y += lp.h
258unifdef-y += mempolicy.h
259unifdef-y += mii.h
260unifdef-y += mman.h
261unifdef-y += mroute.h
262unifdef-y += msdos_fs.h
263unifdef-y += msg.h
264unifdef-y += nbd.h
265unifdef-y += ncp_fs.h
266unifdef-y += ncp.h
267unifdef-y += ncp_mount.h
268unifdef-y += netdevice.h
269unifdef-y += netfilter_bridge.h
270unifdef-y += netfilter_decnet.h
271unifdef-y += netfilter.h
272unifdef-y += netfilter_ipv4.h
273unifdef-y += netfilter_ipv6.h
274unifdef-y += net.h
275unifdef-y += netlink.h
276unifdef-y += nfs3.h
277unifdef-y += nfs4.h
278unifdef-y += nfsacl.h
279unifdef-y += nfs_fs.h
280unifdef-y += nfs.h
281unifdef-y += nfs_idmap.h
282unifdef-y += n_r3964.h
283unifdef-y += nubus.h
284unifdef-y += nvram.h
285unifdef-y += parport.h
286unifdef-y += patchkey.h
287unifdef-y += pci.h
288unifdef-y += pktcdvd.h
289unifdef-y += pmu.h
290unifdef-y += poll.h
291unifdef-y += ppp_defs.h
292unifdef-y += ppp-comp.h
293unifdef-y += ptrace.h
294unifdef-y += qnx4_fs.h
295unifdef-y += quota.h
296unifdef-y += random.h
297unifdef-y += reboot.h
298unifdef-y += reiserfs_fs.h
299unifdef-y += reiserfs_xattr.h
300unifdef-y += romfs_fs.h
301unifdef-y += route.h
302unifdef-y += rtc.h
303unifdef-y += rtnetlink.h
304unifdef-y += scc.h
305unifdef-y += sched.h
306unifdef-y += sdla.h
307unifdef-y += selinux_netlink.h
308unifdef-y += sem.h
309unifdef-y += serial_core.h
310unifdef-y += serial.h
311unifdef-y += serio.h
312unifdef-y += shm.h
313unifdef-y += signal.h
314unifdef-y += smb_fs.h
315unifdef-y += smb.h
316unifdef-y += smb_mount.h
317unifdef-y += socket.h
318unifdef-y += sonet.h
319unifdef-y += sonypi.h
320unifdef-y += soundcard.h
321unifdef-y += stat.h
322unifdef-y += stddef.h
323unifdef-y += sysctl.h
324unifdef-y += tcp.h
325unifdef-y += time.h
326unifdef-y += timex.h
327unifdef-y += tty.h
328unifdef-y += types.h
329unifdef-y += udf_fs_i.h
330unifdef-y += udp.h
331unifdef-y += uinput.h
332unifdef-y += uio.h
333unifdef-y += unistd.h
334unifdef-y += usb_ch9.h
335unifdef-y += usbdevice_fs.h
336unifdef-y += user.h
337unifdef-y += videodev2.h
338unifdef-y += videodev.h
339unifdef-y += wait.h
340unifdef-y += wanrouter.h
341unifdef-y += watchdog.h
342unifdef-y += xfrm.h
343unifdef-y += zftape.h
63 344
64objhdr-y := version.h 345objhdr-y += version.h
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-07 12:36:33 -0500