Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.transmeta.com>2002-02-09 20:48:39 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-02-09 20:48:39 -0800
commit13a4c8e0244e98ea5ba7d8e719b9b1782c7a614b (patch)
tree603b8d3106a265500e3728a2495489ea1f852931
parent4bf08af5c396b095773b2a2e7bc697e91a8243c5 (diff)
parent64d746f0be892326dcde81a4feabfc9bf4f08325 (diff)
Automerge
-rw-r--r--Makefile2
-rw-r--r--arch/alpha/Config.help25
-rw-r--r--arch/arm/Config.help25
-rw-r--r--arch/cris/Config.help25
-rw-r--r--arch/i386/Config.help25
-rw-r--r--arch/ia64/Config.help25
-rw-r--r--arch/mips/Config.help25
-rw-r--r--arch/mips64/Config.help25
-rw-r--r--arch/ppc/Config.help25
-rw-r--r--arch/sparc/Config.help25
-rw-r--r--drivers/isdn/Makefile2
-rw-r--r--drivers/isdn/hisax/elsa.c2
-rw-r--r--drivers/isdn/hisax/gazel.c2
13 files changed, 4 insertions, 229 deletions
diff --git a/Makefile b/Makefile
index b1ae2c3c01ae..113aee82e309 100644
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,6 @@ DRIVERS-y += drivers/base/base.o \
DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
-DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a
DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
DRIVERS-$(CONFIG_APPLETALK) += drivers/net/appletalk/appletalk.o
DRIVERS-$(CONFIG_TR) += drivers/net/tokenring/tr.o
@@ -187,6 +186,7 @@ DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
DRIVERS-$(CONFIG_MD) += drivers/md/mddev.o
DRIVERS-$(CONFIG_BLUEZ) += drivers/bluetooth/bluetooth.o
DRIVERS-$(CONFIG_HOTPLUG_PCI) += drivers/hotplug/vmlinux-obj.o
+DRIVERS-$(CONFIG_ISDN) += drivers/isdn/vmlinux-obj.o
DRIVERS := $(DRIVERS-y)
diff --git a/arch/alpha/Config.help b/arch/alpha/Config.help
index 4a5b50343ff1..3a7e6b9fbf86 100644
--- a/arch/alpha/Config.help
+++ b/arch/alpha/Config.help
@@ -597,31 +597,6 @@ CONFIG_MAGIC_SYSRQ
keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
unless you really know what this hack does.
-CONFIG_ISDN
- ISDN ("Integrated Services Digital Networks", called RNIS in France)
- is a special type of fully digital telephone service; it's mostly
- used to connect to your Internet service provider (with SLIP or
- PPP). The main advantage is that the speed is higher than ordinary
- modem/telephone connections, and that you can have voice
- conversations while downloading stuff. It only works if your
- computer is equipped with an ISDN card and both you and your service
- provider purchased an ISDN line from the phone company. For
- details, read <http://alumni.caltech.edu/~dank/isdn/> on the WWW.
-
- This driver allows you to use an ISDN-card for networking
- connections and as dialin/out device. The isdn-tty's have a built
- in AT-compatible modem emulator. Network devices support autodial,
- channel-bundling, callback and caller-authentication without having
- a daemon running. A reduced T.70 protocol is supported with tty's
- suitable for German BTX. On D-Channel, the protocols EDSS1
- (Euro-ISDN) and 1TR6 (German style) are supported. See
- <file:Documentation/isdn/README> for more information.
-
- If you want to compile the ISDN code as a module ( = code which can
- be inserted in and removed from the running kernel whenever you
- want), say M here and read <file:Documentation/modules.txt>. The
- module will be called isdn.o. If unsure, say N.
-
CONFIG_SRM_ENV
If you enable this option, a subdirectory called srm_environment
will give you access to the most important SRM environment
diff --git a/arch/arm/Config.help b/arch/arm/Config.help
index ff4735b21a85..7b8bfc3f5574 100644
--- a/arch/arm/Config.help
+++ b/arch/arm/Config.help
@@ -471,31 +471,6 @@ CONFIG_MAGIC_SYSRQ
keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
unless you really know what this hack does.
-CONFIG_ISDN
- ISDN ("Integrated Services Digital Networks", called RNIS in France)
- is a special type of fully digital telephone service; it's mostly
- used to connect to your Internet service provider (with SLIP or
- PPP). The main advantage is that the speed is higher than ordinary
- modem/telephone connections, and that you can have voice
- conversations while downloading stuff. It only works if your
- computer is equipped with an ISDN card and both you and your service
- provider purchased an ISDN line from the phone company. For
- details, read <http://alumni.caltech.edu/~dank/isdn/> on the WWW.
-
- This driver allows you to use an ISDN-card for networking
- connections and as dialin/out device. The isdn-tty's have a built
- in AT-compatible modem emulator. Network devices support autodial,
- channel-bundling, callback and caller-authentication without having
- a daemon running. A reduced T.70 protocol is supported with tty's
- suitable for German BTX. On D-Channel, the protocols EDSS1
- (Euro-ISDN) and 1TR6 (German style) are supported. See
- <file:Documentation/isdn/README> for more information.
-
- If you want to compile the ISDN code as a module ( = code which can
- be inserted in and removed from the running kernel whenever you
- want), say M here and read <file:Documentation/modules.txt>. The
- module will be called isdn.o. If unsure, say N.
-
CONFIG_ARCH_ARCA5K
This selects what ARM system you wish to build the kernel for. It
also selects to some extent the CPU type. If you are unsure what
diff --git a/arch/cris/Config.help b/arch/cris/Config.help
index 6dc300a7013e..3f3108558cb2 100644
--- a/arch/cris/Config.help
+++ b/arch/cris/Config.help
@@ -171,31 +171,6 @@ CONFIG_SOUND
Kernel patches and supporting utilities to do that are in the pcsp
package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
-CONFIG_ISDN
- ISDN ("Integrated Services Digital Networks", called RNIS in France)
- is a special type of fully digital telephone service; it's mostly
- used to connect to your Internet service provider (with SLIP or
- PPP). The main advantage is that the speed is higher than ordinary
- modem/telephone connections, and that you can have voice
- conversations while downloading stuff. It only works if your
- computer is equipped with an ISDN card and both you and your service
- provider purchased an ISDN line from the phone company. For
- details, read <http://alumni.caltech.edu/~dank/isdn/> on the WWW.
-
- This driver allows you to use an ISDN-card for networking
- connections and as dialin/out device. The isdn-tty's have a built
- in AT-compatible modem emulator. Network devices support autodial,
- channel-bundling, callback and caller-authentication without having
- a daemon running. A reduced T.70 protocol is supported with tty's
- suitable for German BTX. On D-Channel, the protocols EDSS1
- (Euro-ISDN) and 1TR6 (German style) are supported. See
- <file:Documentation/isdn/README> for more information.
-
- If you want to compile the ISDN code as a module ( = code which can
- be inserted in and removed from the running kernel whenever you
- want), say M here and read <file:Documentation/modules.txt>. The
- module will be called isdn.o. If unsure, say N.
-
CONFIG_ETRAX100LX
Support version 1 of the Etrax 100LX.
diff --git a/arch/i386/Config.help b/arch/i386/Config.help
index abd88edb2efa..c5d53f7eb45d 100644
--- a/arch/i386/Config.help
+++ b/arch/i386/Config.help
@@ -900,31 +900,6 @@ CONFIG_MAGIC_SYSRQ
keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
unless you really know what this hack does.
-CONFIG_ISDN
- ISDN ("Integrated Services Digital Networks", called RNIS in France)
- is a special type of fully digital telephone service; it's mostly
- used to connect to your Internet service provider (with SLIP or
- PPP). The main advantage is that the speed is higher than ordinary
- modem/telephone connections, and that you can have voice
- conversations while downloading stuff. It only works if your
- computer is equipped with an ISDN card and both you and your service
- provider purchased an ISDN line from the phone company. For
- details, read <http://alumni.caltech.edu/~dank/isdn/> on the WWW.
-
- This driver allows you to use an ISDN-card for networking
- connections and as dialin/out device. The isdn-tty's have a built
- in AT-compatible modem emulator. Network devices support autodial,
- channel-bundling, callback and caller-authentication without having
- a daemon running. A reduced T.70 protocol is supported with tty's
- suitable for German BTX. On D-Channel, the protocols EDSS1
- (Euro-ISDN) and 1TR6 (German style) are supported. See
- <file:Documentation/isdn/README> for more information.
-
- If you want to compile the ISDN code as a module ( = code which can
- be inserted in and removed from the running kernel whenever you
- want), say M here and read <file:Documentation/modules.txt>. The
- module will be called isdn.o. If unsure, say N.
-
CONFIG_DEBUG_HIGHMEM
This options enables addition error checking for high memory systems.
Disable for production systems.
diff --git a/arch/ia64/Config.help b/arch/ia64/Config.help
index 23ae7ec73dec..2da75923fa49 100644
--- a/arch/ia64/Config.help
+++ b/arch/ia64/Config.help
@@ -424,31 +424,6 @@ CONFIG_MAGIC_SYSRQ
keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
unless you really know what this hack does.
-CONFIG_ISDN
- ISDN ("Integrated Services Digital Networks", called RNIS in France)
- is a special type of fully digital telephone service; it's mostly
- used to connect to your Internet service provider (with SLIP or
- PPP). The main advantage is that the speed is higher than ordinary
- modem/telephone connections, and that you can have voice
- conversations while downloading stuff. It only works if your
- computer is equipped with an ISDN card and both you and your service
- provider purchased an ISDN line from the phone company. For
- details, read <http://alumni.caltech.edu/~dank/isdn/> on the WWW.
-
- This driver allows you to use an ISDN-card for networking
- connections and as dialin/out device. The isdn-tty's have a built
- in AT-compatible modem emulator. Network devices support autodial,
- channel-bundling, callback and caller-authentication without having
- a daemon running. A reduced T.70 protocol is supported with tty's
- suitable for German BTX. On D-Channel, the protocols EDSS1
- (Euro-ISDN) and 1TR6 (German style) are supported. See
- <file:Documentation/isdn/README> for more information.
-
- If you want to compile the ISDN code as a module ( = code which can
- be inserted in and removed from the running kernel whenever you
- want), say M here and read <file:Documentation/modules.txt>. The
- module will be called isdn.o. If unsure, say N.
-
CONFIG_ITANIUM
Select your IA64 processor type. The default is Intel Itanium.
diff --git a/arch/mips/Config.help b/arch/mips/Config.help
index 82851d00bfef..56a642678329 100644
--- a/arch/mips/Config.help
+++ b/arch/mips/Config.help
@@ -899,31 +899,6 @@ CONFIG_MAGIC_SYSRQ
keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
unless you really know what this hack does.
-CONFIG_ISDN
- ISDN ("Integrated Services Digital Networks", called RNIS in France)
- is a special type of fully digital telephone service; it's mostly
- used to connect to your Internet service provider (with SLIP or
- PPP). The main advantage is that the speed is higher than ordinary
- modem/telephone connections, and that you can have voice
- conversations while downloading stuff. It only works if your
- computer is equipped with an ISDN card and both you and your service
- provider purchased an ISDN line from the phone company. For
- details, read <http://alumni.caltech.edu/~dank/isdn/> on the WWW.
-
- This driver allows you to use an ISDN-card for networking
- connections and as dialin/out device. The isdn-tty's have a built
- in AT-compatible modem emulator. Network devices support autodial,
- channel-bundling, callback and caller-authentication without having
- a daemon running. A reduced T.70 protocol is supported with tty's
- suitable for German BTX. On D-Channel, the protocols EDSS1
- (Euro-ISDN) and 1TR6 (German style) are supported. See
- <file:Documentation/isdn/README> for more information.
-
- If you want to compile the ISDN code as a module ( = code which can
- be inserted in and removed from the running kernel whenever you
- want), say M here and read <file:Documentation/modules.txt>. The
- module will be called isdn.o. If unsure, say N.
-
CONFIG_GDB_CONSOLE
If you are using GDB for remote debugging over a serial port and
would like kernel messages to be formatted into GDB $O packets so
diff --git a/arch/mips64/Config.help b/arch/mips64/Config.help
index f82765e84d69..3e09dbb67d76 100644
--- a/arch/mips64/Config.help
+++ b/arch/mips64/Config.help
@@ -438,31 +438,6 @@ CONFIG_MAGIC_SYSRQ
keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
unless you really know what this hack does.
-CONFIG_ISDN
- ISDN ("Integrated Services Digital Networks", called RNIS in France)
- is a special type of fully digital telephone service; it's mostly
- used to connect to your Internet service provider (with SLIP or
- PPP). The main advantage is that the speed is higher than ordinary
- modem/telephone connections, and that you can have voice
- conversations while downloading stuff. It only works if your
- computer is equipped with an ISDN card and both you and your service
- provider purchased an ISDN line from the phone company. For
- details, read <http://alumni.caltech.edu/~dank/isdn/> on the WWW.
-
- This driver allows you to use an ISDN-card for networking
- connections and as dialin/out device. The isdn-tty's have a built
- in AT-compatible modem emulator. Network devices support autodial,
- channel-bundling, callback and caller-authentication without having
- a daemon running. A reduced T.70 protocol is supported with tty's
- suitable for German BTX. On D-Channel, the protocols EDSS1
- (Euro-ISDN) and 1TR6 (German style) are supported. See
- <file:Documentation/isdn/README> for more information.
-
- If you want to compile the ISDN code as a module ( = code which can
- be inserted in and removed from the running kernel whenever you
- want), say M here and read <file:Documentation/modules.txt>. The
- module will be called isdn.o. If unsure, say N.
-
CONFIG_BINFMT_ELF32
This allows you to run 32-bit Linux/ELF binaries on your Ultra.
Everybody wants this; say Y.
diff --git a/arch/ppc/Config.help b/arch/ppc/Config.help
index 5786797a89b2..603820e451d2 100644
--- a/arch/ppc/Config.help
+++ b/arch/ppc/Config.help
@@ -551,31 +551,6 @@ CONFIG_MAGIC_SYSRQ
keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
unless you really know what this hack does.
-CONFIG_ISDN
- ISDN ("Integrated Services Digital Networks", called RNIS in France)
- is a special type of fully digital telephone service; it's mostly
- used to connect to your Internet service provider (with SLIP or
- PPP). The main advantage is that the speed is higher than ordinary
- modem/telephone connections, and that you can have voice
- conversations while downloading stuff. It only works if your
- computer is equipped with an ISDN card and both you and your service
- provider purchased an ISDN line from the phone company. For
- details, read <http://alumni.caltech.edu/~dank/isdn/> on the WWW.
-
- This driver allows you to use an ISDN-card for networking
- connections and as dialin/out device. The isdn-tty's have a built
- in AT-compatible modem emulator. Network devices support autodial,
- channel-bundling, callback and caller-authentication without having
- a daemon running. A reduced T.70 protocol is supported with tty's
- suitable for German BTX. On D-Channel, the protocols EDSS1
- (Euro-ISDN) and 1TR6 (German style) are supported. See
- <file:Documentation/isdn/README> for more information.
-
- If you want to compile the ISDN code as a module ( = code which can
- be inserted in and removed from the running kernel whenever you
- want), say M here and read <file:Documentation/modules.txt>. The
- module will be called isdn.o. If unsure, say N.
-
CONFIG_PROC_HARDWARE
Say Y here to support the /proc/hardware file, which gives you
access to information about the machine you're running on,
diff --git a/arch/sparc/Config.help b/arch/sparc/Config.help
index a6c229093a21..f64c93438e45 100644
--- a/arch/sparc/Config.help
+++ b/arch/sparc/Config.help
@@ -1054,31 +1054,6 @@ CONFIG_MAGIC_SYSRQ
keys are documented in <file:Documentation/sysrq.txt>. Don't say Y
unless you really know what this hack does.
-CONFIG_ISDN
- ISDN ("Integrated Services Digital Networks", called RNIS in France)
- is a special type of fully digital telephone service; it's mostly
- used to connect to your Internet service provider (with SLIP or
- PPP). The main advantage is that the speed is higher than ordinary
- modem/telephone connections, and that you can have voice
- conversations while downloading stuff. It only works if your
- computer is equipped with an ISDN card and both you and your service
- provider purchased an ISDN line from the phone company. For
- details, read <http://alumni.caltech.edu/~dank/isdn/> on the WWW.
-
- This driver allows you to use an ISDN-card for networking
- connections and as dialin/out device. The isdn-tty's have a built
- in AT-compatible modem emulator. Network devices support autodial,
- channel-bundling, callback and caller-authentication without having
- a daemon running. A reduced T.70 protocol is supported with tty's
- suitable for German BTX. On D-Channel, the protocols EDSS1
- (Euro-ISDN) and 1TR6 (German style) are supported. See
- <file:Documentation/isdn/README> for more information.
-
- If you want to compile the ISDN code as a module ( = code which can
- be inserted in and removed from the running kernel whenever you
- want), say M here and read <file:Documentation/modules.txt>. The
- module will be called isdn.o. If unsure, say N.
-
CONFIG_SUN4
Say Y here if, and only if, your machine is a Sun4. Note that
a kernel compiled with this option will run only on Sun4.
diff --git a/drivers/isdn/Makefile b/drivers/isdn/Makefile
index a30e5f9709d2..88e37e3d47c9 100644
--- a/drivers/isdn/Makefile
+++ b/drivers/isdn/Makefile
@@ -2,7 +2,7 @@
# The target object and module list name.
-O_TARGET := isdn.a
+O_TARGET := vmlinux-obj.o
# Objects that export symbols.
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c
index 65043e636b52..4462060662c2 100644
--- a/drivers/isdn/hisax/elsa.c
+++ b/drivers/isdn/hisax/elsa.c
@@ -1017,7 +1017,7 @@ setup_elsa(struct IsdnCard *card)
return(0);
}
if (cs->hw.elsa.cfg & 0x80 && pci_rev == 1) {
- printk(KERN_INFO "Elsa: PLX9050 rev1 workaround activated");
+ printk(KERN_INFO "Elsa: PLX9050 rev1 workaround activated\n");
set_bit(FLG_BUGGY_PLX9050, &cs->HW_Flags);
}
cs->hw.elsa.ale = cs->hw.elsa.base;
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c
index a99fc45e1643..3de9d2187658 100644
--- a/drivers/isdn/hisax/gazel.c
+++ b/drivers/isdn/hisax/gazel.c
@@ -636,7 +636,7 @@ setup_gazelpci(struct IsdnCardState *cs)
if (cs->hw.gazel.cfg_reg & 0x80) {
pci_read_config_byte(dev_tel, PCI_REVISION_ID, &pci_rev);
if (pci_rev == 1) {
- printk(KERN_INFO "Gazel: PLX9050 rev1 workaround activated");
+ printk(KERN_INFO "Gazel: PLX9050 rev1 workaround activated\n");
set_bit(FLG_BUGGY_PLX9050, &cs->HW_Flags);
}
}