diff options
author | thompsa <thompsa@FreeBSD.org> | 2009-05-27 16:16:56 +0000 |
---|---|---|
committer | thompsa <thompsa@FreeBSD.org> | 2009-05-27 16:16:56 +0000 |
commit | 14ea3ee2bb371575697cd652ca2064877b187983 (patch) | |
tree | 723b0aed327f79b20884592648d5b64748a24f12 /sys/conf | |
parent | 3f72bbde95ea9eee2e163b14ffdca8533a85e6c1 (diff) | |
download | FreeBSD-src-14ea3ee2bb371575697cd652ca2064877b187983.zip FreeBSD-src-14ea3ee2bb371575697cd652ca2064877b187983.tar.gz |
Delete the old USB stack. The new stack has settled in and has all the
drivers/functionality and then some.
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/files | 54 | ||||
-rw-r--r-- | sys/conf/kern.pre.mk | 6 |
2 files changed, 3 insertions, 57 deletions
diff --git a/sys/conf/files b/sys/conf/files index 6500775..166bed8 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -80,12 +80,12 @@ teken_state.h optional sc \ compile-with "${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \ no-obj no-implicit-rule before-depend \ clean "teken_state.h" -usbdevs.h optional usb | ousb \ +usbdevs.h optional usb \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \ no-obj no-implicit-rule before-depend \ clean "usbdevs.h" -usbdevs_data.h optional usb | ousb \ +usbdevs_data.h optional usb \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \ no-obj no-implicit-rule before-depend \ @@ -503,7 +503,6 @@ dev/ata/chipsets/ata-via.c optional ata pci | atavia dev/ata/ata-disk.c optional atadisk dev/ata/ata-raid.c optional ataraid dev/ata/ata-usb.c optional atausb usb -legacy/dev/ata/ata-usb.c optional atausb ousb dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist @@ -1421,8 +1420,6 @@ dev/sound/pcm/sound.c optional sound dev/sound/pcm/vchan.c optional sound dev/sound/usb/uaudio.c optional snd_uaudio usb dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb -legacy/dev/sound/usb/uaudio.c optional snd_uaudio ousb -legacy/dev/sound/usb/uaudio_pcm.c optional snd_uaudio ousb dev/sound/midi/midi.c optional sound dev/sound/midi/mpu401.c optional sound dev/sound/midi/mpu_if.m optional sound @@ -1502,51 +1499,6 @@ dev/uart/uart_subr.c optional uart dev/uart/uart_tty.c optional uart dev/ubsec/ubsec.c optional ubsec # -# USB support -legacy/dev/usb/ehci.c optional oehci -legacy/dev/usb/ehci_ddb.c optional oehci -legacy/dev/usb/ehci_pci.c optional oehci pci -legacy/dev/usb/hid.c optional ousb -legacy/dev/usb/ohci.c optional oohci -legacy/dev/usb/ohci_pci.c optional oohci pci -legacy/dev/usb/sl811hs.c optional oslhci -legacy/dev/usb/slhci_pccard.c optional oslhci pccard -legacy/dev/usb/uark.c optional ouark -legacy/dev/usb/u3g.c optional ou3g -legacy/dev/usb/ubsa.c optional oubsa -legacy/dev/usb/ubser.c optional oubser -legacy/dev/usb/ucom.c optional oucom -legacy/dev/usb/ucycom.c optional oucycom -legacy/dev/usb/udbp.c optional oudbp -legacy/dev/usb/ufoma.c optional oufoma -legacy/dev/usb/ufm.c optional oufm -legacy/dev/usb/uftdi.c optional ouftdi -legacy/dev/usb/ugen.c optional ougen -legacy/dev/usb/uhci.c optional ouhci -legacy/dev/usb/uhci_pci.c optional ouhci pci -legacy/dev/usb/uhid.c optional ouhid -legacy/dev/usb/uhub.c optional ousb -legacy/dev/usb/uipaq.c optional ouipaq -legacy/dev/usb/ukbd.c optional oukbd -legacy/dev/usb/ulpt.c optional oulpt -legacy/dev/usb/umass.c optional oumass -legacy/dev/usb/umct.c optional oumct -legacy/dev/usb/umodem.c optional oumodem -legacy/dev/usb/ums.c optional oums -legacy/dev/usb/uplcom.c optional ouplcom -legacy/dev/usb/urio.c optional ourio -legacy/dev/usb/usb.c optional ousb -legacy/dev/usb/usb_if.m optional ousb -legacy/dev/usb/usb_mem.c optional ousb -legacy/dev/usb/usb_quirks.c optional ousb -legacy/dev/usb/usb_subr.c optional ousb -legacy/dev/usb/usbdi.c optional ousb -legacy/dev/usb/usbdi_util.c optional ousb -legacy/dev/usb/uscanner.c optional ouscanner -legacy/dev/usb/uslcom.c optional ouslcom -legacy/dev/usb/uvisor.c optional ouvisor -legacy/dev/usb/uvscom.c optional ouvscom -# # USB controller drivers # dev/usb/controller/at91dci.c optional at91dci @@ -2252,8 +2204,6 @@ netgraph/atm/uni/ng_uni.c optional ngatm_uni \ netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c optional netgraph_bluetooth_bt3c netgraph/bluetooth/drivers/h4/ng_h4.c optional netgraph_bluetooth_h4 -netgraph/bluetooth/drivers/ubt/ng_ubt.c optional netgraph_bluetooth_ubt ousb -netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c optional netgraph_bluetooth_ubtbcmfw ousb netgraph/bluetooth/hci/ng_hci_cmds.c optional netgraph_bluetooth_hci netgraph/bluetooth/hci/ng_hci_evnt.c optional netgraph_bluetooth_hci netgraph/bluetooth/hci/ng_hci_main.c optional netgraph_bluetooth_hci diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 30ba6a8..ee74a9e 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -53,11 +53,7 @@ C_DIALECT= -std=c99 NOSTDINC= -nostdinc .endif -.if defined(WITH_LEGACY) -LEGACY_INC= -I$S/legacy -.endif - -INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. ${LEGACY_INC} -I$S +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S # This hack lets us use the OpenBSD altq code without spamming a new # include path into contrib'ed source files. |