diff options
| author | des <des@FreeBSD.org> | 2003-04-12 09:40:37 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-04-12 09:40:37 +0000 |
| commit | 09bb4feff1e839c244c350377ee9c3e3e03889ad (patch) | |
| tree | 129c4e27895d448d627765e912b1b728faaa89eb /sys/conf | |
| parent | 708a319e8e66a68256ef0b4fce7459c5342e14cd (diff) | |
| download | FreeBSD-src-09bb4feff1e839c244c350377ee9c3e3e03889ad.zip FreeBSD-src-09bb4feff1e839c244c350377ee9c3e3e03889ad.tar.gz | |
Options that go into homonymous headers shouldn't specify the header name.
Submitted by: Hiten Pandya <hiten@unixdaemons.com>
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/options | 10 | ||||
| -rw-r--r-- | sys/conf/options.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/options.i386 | 2 | ||||
| -rw-r--r-- | sys/conf/options.ia64 | 2 | ||||
| -rw-r--r-- | sys/conf/options.pc98 | 2 | ||||
| -rw-r--r-- | sys/conf/options.powerpc | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/sys/conf/options b/sys/conf/options index 6782ebb..996c706 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -72,7 +72,7 @@ ADW_ALLOW_MEMIO opt_adw.h # Allow PCI devices to use memory # mapped I/O # Miscellaneous options. -ALQ opt_alq.h +ALQ ADAPTIVE_MUTEXES COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h @@ -153,7 +153,7 @@ P1003_1B_SEMAPHORES opt_posix.h # SECURITY POLICY PARAMETERS # Support for Mandatory Access Control (MAC) -MAC opt_mac.h +MAC MAC_BIBA opt_dontuse.h MAC_BSDEXTENDED opt_dontuse.h MAC_DEBUG opt_mac.h @@ -349,10 +349,10 @@ IPV6FIREWALL_VERBOSE opt_ip6fw.h IPV6FIREWALL_VERBOSE_LIMIT opt_ip6fw.h IPV6FIREWALL_DEFAULT_TO_ACCEPT opt_ip6fw.h IPSTEALTH -IPX opt_ipx.h +IPX IPXIP opt_ipx.h LIBMCHAIN -NCP opt_ncp.h +NCP NETATALK opt_atalk.h PPP_BSDCOMP opt_ppp.h PPP_DEFLATE opt_ppp.h @@ -417,7 +417,7 @@ ATM_UNI opt_atm.h # XXX Conflict: # of devices vs network protocol (Native ATM). # This makes "atm.h" unusable. -NATM opt_natm.h +NATM DPT_ALLOW_MEMIO opt_dpt.h # Allow PCI devices to use memory # mapped I/O diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index 4735974..7db7d8f3 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -40,7 +40,7 @@ VGA_NO_MODE_CHANGE opt_vga.h VGA_SLOW_IOACCESS opt_vga.h VGA_WIDTH90 opt_vga.h -VESA opt_vesa.h +VESA VESA_DEBUG opt_vesa.h ATKBD_DFLT_KEYMAP opt_atkbd.h diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index de784be..3de1be2 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -109,7 +109,7 @@ VGA_NO_MODE_CHANGE opt_vga.h VGA_SLOW_IOACCESS opt_vga.h VGA_WIDTH90 opt_vga.h -VESA opt_vesa.h +VESA VESA_DEBUG opt_vesa.h PSM_HOOKRESUME opt_psm.h diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64 index 89e64e1..0428336 100644 --- a/sys/conf/options.ia64 +++ b/sys/conf/options.ia64 @@ -4,7 +4,7 @@ ITANIUM opt_global.h ITANIUM2 opt_global.h -IA32 opt_ia32.h +IA32 PAGE_SIZE_4K opt_global.h PAGE_SIZE_8K opt_global.h diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index bc625d4..e73df06 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -94,7 +94,7 @@ SC_RENDER_DEBUG opt_syscons.h SC_TWOBUTTON_MOUSE opt_syscons.h SC_NO_SUSPEND_VTYSWITCH opt_syscons.h -GDC opt_gdc.h +GDC KBD_DISABLE_KEYMAP_LOAD opt_kbd.h KBD_INSTALL_CDEV opt_kbd.h diff --git a/sys/conf/options.powerpc b/sys/conf/options.powerpc index 069c808..9012b6b 100644 --- a/sys/conf/options.powerpc +++ b/sys/conf/options.powerpc @@ -2,7 +2,7 @@ # Options specific to the powerpc platform kernels OEA opt_global.h -IPKDB opt_ipkdb.h +IPKDB POWERMAC opt_platform.h -PSIM opt_psim.h +PSIM |
