diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/pnp | |
parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'drivers/pnp')
-rw-r--r-- | drivers/pnp/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pnp/Makefile b/drivers/pnp/Makefile index c6ffb2162..b6adf3ce0 100644 --- a/drivers/pnp/Makefile +++ b/drivers/pnp/Makefile @@ -11,7 +11,7 @@ O_TARGET := pnp.o export-objs := isapnp.o -multi-objs := isa-pnp.o +list-multi := isa-pnp.o proc-$(CONFIG_PROC_FS) = isapnp_proc.o isa-pnp-objs := isapnp.o quirks.o $(proc-y) |