aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorKATO Takenori <kato@FreeBSD.org>1999-12-20 11:00:02 +0000
committerKATO Takenori <kato@FreeBSD.org>1999-12-20 11:00:02 +0000
commit33325d54847c48c1bda5c6abb22f0aa73f82de8e (patch)
tree1470657fbc99efe93203c66b4d689090c44f82f0 /sys
parent12af1e4a86bc88a497e18a0a533ed0117d581311 (diff)
downloadsrc-33325d54847c48c1bda5c6abb22f0aa73f82de8e.tar.gz
src-33325d54847c48c1bda5c6abb22f0aa73f82de8e.zip
Sync with sys/i386/conf/options.i386 rev 1.130.
Notes
Notes: svn path=/head/; revision=54880
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/options.pc9811
-rw-r--r--sys/pc98/conf/options.pc9811
2 files changed, 12 insertions, 10 deletions
diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98
index 4d5eaf080efe..717390382036 100644
--- a/sys/conf/options.pc98
+++ b/sys/conf/options.pc98
@@ -86,7 +86,7 @@ SC_TWOBUTTON_MOUSE opt_syscons.h
GDC opt_gdc.h
-PSM_HOOKAPM opt_psm.h
+PSM_HOOKRESUME opt_psm.h
PSM_RESETAFTERSUSPEND opt_psm.h
PSM_DEBUG opt_psm.h
@@ -138,7 +138,7 @@ TEL_S0_16 opt_i4b.h
TEL_S0_16_3 opt_i4b.h
AVM_A1 opt_i4b.h
USR_STI opt_i4b.h
-ITKIX1 opt_i4b.h
+#ITKIX1 opt_i4b.h
ELSA_PCC16 opt_i4b.h
# -------------------------------
# isdn4bsd: passive ISA PnP cards
@@ -147,10 +147,10 @@ CRTX_S0_P opt_i4b.h
DRN_NGO opt_i4b.h
TEL_S0_16_3_P opt_i4b.h
SEDLBAUER opt_i4b.h
-DYNALINK opt_i4b.h
+#DYNALINK opt_i4b.h
ASUSCOM_IPAC opt_i4b.h
ELSA_QS1ISA opt_i4b.h
-AVM_PNP opt_i4b.h
+#AVM_PNP opt_i4b.h
SIEMENS_ISURF2 opt_i4b.h
# -------------------------------
# isdn4bsd: passive PCI cards
@@ -160,7 +160,7 @@ AVM_A1_PCI opt_i4b.h
# -------------------------------
# isdn4bsd: passive PCMCIA cards
# -------------------------------
-AVM_A1_PCMCIA opt_i4b.h
+#AVM_A1_PCMCIA opt_i4b.h
# -------------------------------
# isdn4bsd: misc options
# -------------------------------
@@ -168,6 +168,7 @@ AVM_A1_PCMCIA opt_i4b.h
I4B_SMP_WORKAROUND opt_i4b.h
# enable VJ compression code for ipr i/f
IPR_VJ opt_i4b.h
+IPR_LOG opt_i4b.h
# -------------------------------
# oltr: build options
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
index 4d5eaf080efe..717390382036 100644
--- a/sys/pc98/conf/options.pc98
+++ b/sys/pc98/conf/options.pc98
@@ -86,7 +86,7 @@ SC_TWOBUTTON_MOUSE opt_syscons.h
GDC opt_gdc.h
-PSM_HOOKAPM opt_psm.h
+PSM_HOOKRESUME opt_psm.h
PSM_RESETAFTERSUSPEND opt_psm.h
PSM_DEBUG opt_psm.h
@@ -138,7 +138,7 @@ TEL_S0_16 opt_i4b.h
TEL_S0_16_3 opt_i4b.h
AVM_A1 opt_i4b.h
USR_STI opt_i4b.h
-ITKIX1 opt_i4b.h
+#ITKIX1 opt_i4b.h
ELSA_PCC16 opt_i4b.h
# -------------------------------
# isdn4bsd: passive ISA PnP cards
@@ -147,10 +147,10 @@ CRTX_S0_P opt_i4b.h
DRN_NGO opt_i4b.h
TEL_S0_16_3_P opt_i4b.h
SEDLBAUER opt_i4b.h
-DYNALINK opt_i4b.h
+#DYNALINK opt_i4b.h
ASUSCOM_IPAC opt_i4b.h
ELSA_QS1ISA opt_i4b.h
-AVM_PNP opt_i4b.h
+#AVM_PNP opt_i4b.h
SIEMENS_ISURF2 opt_i4b.h
# -------------------------------
# isdn4bsd: passive PCI cards
@@ -160,7 +160,7 @@ AVM_A1_PCI opt_i4b.h
# -------------------------------
# isdn4bsd: passive PCMCIA cards
# -------------------------------
-AVM_A1_PCMCIA opt_i4b.h
+#AVM_A1_PCMCIA opt_i4b.h
# -------------------------------
# isdn4bsd: misc options
# -------------------------------
@@ -168,6 +168,7 @@ AVM_A1_PCMCIA opt_i4b.h
I4B_SMP_WORKAROUND opt_i4b.h
# enable VJ compression code for ipr i/f
IPR_VJ opt_i4b.h
+IPR_LOG opt_i4b.h
# -------------------------------
# oltr: build options