mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-04 12:52:15 +00:00
Garbage collect options AVM_A1_PCI, AVM_A1_PCMCIA, DEBUG_LINUX, DEV_APM,
GUS_DMA, GUS_DMA2, GUS_IRQ, OLTR_NO_BULLSEYE_MAC, OLTR_NO_HAWKEYE_MAC, OLTR_NO_TMS_MAC and PCIC_RESUME_RESET.
This commit is contained in:
parent
235b52974f
commit
039b360dac
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=90690
@ -39,8 +39,6 @@
|
||||
#ifndef _LINUX_UTIL_H_
|
||||
#define _LINUX_UTIL_H_
|
||||
|
||||
#include "opt_linux.h"
|
||||
|
||||
#include <vm/vm.h>
|
||||
#include <vm/vm_param.h>
|
||||
#include <vm/pmap.h>
|
||||
|
@ -1926,9 +1926,6 @@ hint.wl.0.port="0x300"
|
||||
device xe
|
||||
|
||||
device oltr
|
||||
options OLTR_NO_BULLSEYE_MAC
|
||||
options OLTR_NO_HAWKEYE_MAC
|
||||
options OLTR_NO_TMS_MAC
|
||||
hint.oltr.0.at="isa"
|
||||
|
||||
# PCI Ethernet NICs that use the common MII bus controller code.
|
||||
@ -2385,9 +2382,6 @@ device card
|
||||
#device pccard
|
||||
#device cardbus
|
||||
|
||||
# You may need to reset all pccards after resuming
|
||||
options PCIC_RESUME_RESET # reset after resume
|
||||
|
||||
#
|
||||
# Laptop/Notebook options:
|
||||
#
|
||||
@ -2802,9 +2796,6 @@ options COMPAT_LINUX
|
||||
# and PSEUDOFS)
|
||||
options LINPROCFS
|
||||
|
||||
# Linux debugging
|
||||
options DEBUG_LINUX
|
||||
|
||||
#
|
||||
# SysVR4 ABI emulation
|
||||
#
|
||||
|
@ -74,9 +74,8 @@ TIMER_FREQ opt_clock.h
|
||||
|
||||
# Options for emulators. These should only be used at config time, so
|
||||
# they are handled like options for static file systems
|
||||
# (see src/sys/conf/options), except for broken debugging options.
|
||||
# (see src/sys/conf/options).
|
||||
COMPAT_LINUX opt_dontuse.h
|
||||
DEBUG_LINUX opt_linux.h
|
||||
COMPAT_OSF1 opt_dontuse.h
|
||||
|
||||
# Device options
|
||||
|
@ -27,7 +27,6 @@ KSTACK_PAGES
|
||||
# (see src/sys/conf/options), except for broken debugging options.
|
||||
IBCS2 opt_dontuse.h
|
||||
COMPAT_LINUX opt_dontuse.h
|
||||
DEBUG_LINUX opt_linux.h
|
||||
COMPAT_SVR4 opt_dontuse.h
|
||||
DEBUG_SVR4 opt_svr4.h
|
||||
PECOFF_SUPPORT opt_dontuse.h
|
||||
@ -108,8 +107,6 @@ PSM_HOOKRESUME opt_psm.h
|
||||
PSM_RESETAFTERSUSPEND opt_psm.h
|
||||
PSM_DEBUG opt_psm.h
|
||||
|
||||
PCIC_RESUME_RESET opt_pcic.h
|
||||
|
||||
ATKBD_DFLT_KEYMAP opt_atkbd.h
|
||||
|
||||
KBD_DISABLE_KEYMAP_LOAD opt_kbd.h
|
||||
@ -135,11 +132,6 @@ PCVT_USEKBDSEC opt_pcvt.h
|
||||
PCVT_VT220KEYB opt_pcvt.h
|
||||
PCVT_GREENSAVER opt_pcvt.h
|
||||
|
||||
# voxware options
|
||||
GUS_DMA2 opt_sound.h
|
||||
GUS_DMA opt_sound.h
|
||||
GUS_IRQ opt_sound.h
|
||||
|
||||
# Video spigot
|
||||
SPIGOT_UNSECURE opt_spigot.h
|
||||
|
||||
@ -170,11 +162,6 @@ COMPAQ_M610 opt_i4b.h
|
||||
# isdn4bsd: passive PCI cards
|
||||
# -------------------------------
|
||||
ELSA_QS1PCI opt_i4b.h
|
||||
AVM_A1_PCI opt_i4b.h
|
||||
# -------------------------------
|
||||
# isdn4bsd: passive PCMCIA cards
|
||||
# -------------------------------
|
||||
#AVM_A1_PCMCIA opt_i4b.h
|
||||
# -------------------------------
|
||||
# isdn4bsd: misc options
|
||||
# -------------------------------
|
||||
@ -184,21 +171,12 @@ I4B_SMP_WORKAROUND opt_i4b.h
|
||||
IPR_VJ opt_i4b.h
|
||||
IPR_LOG opt_i4b.h
|
||||
|
||||
# -------------------------------
|
||||
# oltr: build options
|
||||
# -------------------------------
|
||||
# Exclude microcode options
|
||||
OLTR_NO_TMS_MAC opt_oltr.h
|
||||
OLTR_NO_HAWKEYE_MAC opt_oltr.h
|
||||
OLTR_NO_BULLSEYE_MAC opt_oltr.h
|
||||
|
||||
# Total number of ports controlled by the dgb(4) driver.
|
||||
# Defaults to NDGB*16.
|
||||
NDGBPORTS opt_dgb.h
|
||||
|
||||
# Device options
|
||||
DEV_NPX opt_npx.h
|
||||
DEV_APM opt_apm.h
|
||||
DEV_SPLASH opt_splash.h
|
||||
|
||||
# SMB/CIFS requester
|
||||
|
@ -27,7 +27,6 @@ KSTACK_PAGES
|
||||
# (see src/sys/conf/options), except for broken debugging options.
|
||||
IBCS2 opt_dontuse.h
|
||||
COMPAT_LINUX opt_dontuse.h
|
||||
DEBUG_LINUX opt_linux.h
|
||||
COMPAT_SVR4 opt_dontuse.h
|
||||
DEBUG_SVR4 opt_svr4.h
|
||||
PECOFF_SUPPORT opt_dontuse.h
|
||||
@ -100,8 +99,6 @@ PSM_HOOKRESUME opt_psm.h
|
||||
PSM_RESETAFTERSUSPEND opt_psm.h
|
||||
PSM_DEBUG opt_psm.h
|
||||
|
||||
PCIC_RESUME_RESET opt_pcic.h
|
||||
|
||||
KBD_DISABLE_KEYMAP_LOAD opt_kbd.h
|
||||
KBD_INSTALL_CDEV opt_kbd.h
|
||||
KBD_MAXRETRY opt_kbd.h
|
||||
@ -125,11 +122,6 @@ PCVT_USEKBDSEC opt_pcvt.h
|
||||
PCVT_VT220KEYB opt_pcvt.h
|
||||
PCVT_GREENSAVER opt_pcvt.h
|
||||
|
||||
# voxware options
|
||||
GUS_DMA2 opt_sound.h
|
||||
GUS_DMA opt_sound.h
|
||||
GUS_IRQ opt_sound.h
|
||||
|
||||
# Video spigot
|
||||
SPIGOT_UNSECURE opt_spigot.h
|
||||
|
||||
@ -160,11 +152,6 @@ COMPAQ_M610 opt_i4b.h
|
||||
# isdn4bsd: passive PCI cards
|
||||
# -------------------------------
|
||||
ELSA_QS1PCI opt_i4b.h
|
||||
AVM_A1_PCI opt_i4b.h
|
||||
# -------------------------------
|
||||
# isdn4bsd: passive PCMCIA cards
|
||||
# -------------------------------
|
||||
#AVM_A1_PCMCIA opt_i4b.h
|
||||
# -------------------------------
|
||||
# isdn4bsd: misc options
|
||||
# -------------------------------
|
||||
@ -174,14 +161,6 @@ I4B_SMP_WORKAROUND opt_i4b.h
|
||||
IPR_VJ opt_i4b.h
|
||||
IPR_LOG opt_i4b.h
|
||||
|
||||
# -------------------------------
|
||||
# oltr: build options
|
||||
# -------------------------------
|
||||
# Exclude microcode options
|
||||
OLTR_NO_TMS_MAC opt_oltr.h
|
||||
OLTR_NO_HAWKEYE_MAC opt_oltr.h
|
||||
OLTR_NO_BULLSEYE_MAC opt_oltr.h
|
||||
|
||||
# Total number of ports controlled by the dgb(4) driver.
|
||||
# Defaults to NDGB*16.
|
||||
NDGBPORTS opt_dgb.h
|
||||
@ -205,7 +184,6 @@ LINE30 opt_syscons.h
|
||||
|
||||
# Device options
|
||||
DEV_NPX opt_npx.h
|
||||
DEV_APM opt_apm.h
|
||||
DEV_SPLASH opt_splash.h
|
||||
DEV_MECIA opt_mecia.h
|
||||
|
||||
|
@ -1926,9 +1926,6 @@ hint.wl.0.port="0x300"
|
||||
device xe
|
||||
|
||||
device oltr
|
||||
options OLTR_NO_BULLSEYE_MAC
|
||||
options OLTR_NO_HAWKEYE_MAC
|
||||
options OLTR_NO_TMS_MAC
|
||||
hint.oltr.0.at="isa"
|
||||
|
||||
# PCI Ethernet NICs that use the common MII bus controller code.
|
||||
@ -2385,9 +2382,6 @@ device card
|
||||
#device pccard
|
||||
#device cardbus
|
||||
|
||||
# You may need to reset all pccards after resuming
|
||||
options PCIC_RESUME_RESET # reset after resume
|
||||
|
||||
#
|
||||
# Laptop/Notebook options:
|
||||
#
|
||||
@ -2802,9 +2796,6 @@ options COMPAT_LINUX
|
||||
# and PSEUDOFS)
|
||||
options LINPROCFS
|
||||
|
||||
# Linux debugging
|
||||
options DEBUG_LINUX
|
||||
|
||||
#
|
||||
# SysVR4 ABI emulation
|
||||
#
|
||||
|
@ -32,8 +32,6 @@
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#include "opt_pcic.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/systm.h>
|
||||
|
Loading…
Reference in New Issue
Block a user