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.

5 files changed, 5 insertions, 13 deletions

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index e1e0745a4..70882d953 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -20,14 +20,6 @@ EXTRA_CFLAGS += -I./include
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)
 
-# genksyms only reads $(CFLAGS), it should really read $(EXTRA_CFLAGS) as well.
-# Without EXTRA_CFLAGS the gcc pass for genksyms fails, resulting in an empty
-# include/linux/modules/acpi_ksyms.ver.  Changing genkyms to use EXTRA_CFLAGS
-# will hit everything, too risky in 2.4.0-prerelease.  Bandaid by tweaking
-# CFLAGS only for .ver targets.  Review after 2.4.0 release.  KAO
-
-$(MODINCL)/%.ver: CFLAGS := -I./include $(CFLAGS)
-
 acpi-subdirs := common dispatcher events hardware \
 		interpreter namespace parser resources tables
 
diff --git a/drivers/acpi/events/evsci.c b/drivers/acpi/events/evsci.c
index 369d2f184..0333b16da 100644
--- a/drivers/acpi/events/evsci.c
+++ b/drivers/acpi/events/evsci.c
@@ -177,7 +177,7 @@ acpi_ev_remove_sci_handler (void)
  * PARAMETERS:  Event       Event that generated an SCI.
  *
  * RETURN:      Number of SCI's for requested event since last time
- *              Sci_occured() was called for this event.
+ *              Sci_occurred() was called for this event.
  *
  * DESCRIPTION: Checks to see if SCI has been generated from requested source
  *              since the last time this function was called.
diff --git a/drivers/acpi/include/acconfig.h b/drivers/acpi/include/acconfig.h
index e45c17db8..3f5da4a7e 100644
--- a/drivers/acpi/include/acconfig.h
+++ b/drivers/acpi/include/acconfig.h
@@ -89,7 +89,7 @@
 /*
  * Debugger threading model
  * Use single threaded if the entire subsystem is contained in an application
- * Use multiple threaded when the the subsystem is running in the kernel.
+ * Use multiple threaded when the subsystem is running in the kernel.
  *
  * By default the model is single threaded if ACPI_APPLICATION is set,
  * multi-threaded if ACPI_APPLICATION is not set.
diff --git a/drivers/acpi/interpreter/amstore.c b/drivers/acpi/interpreter/amstore.c
index bb3c5c500..3c5d03ed2 100644
--- a/drivers/acpi/interpreter/amstore.c
+++ b/drivers/acpi/interpreter/amstore.c
@@ -190,7 +190,7 @@ acpi_aml_exec_store (
  * FUNCTION:    Acpi_aml_store_object_to_index
  *
  * PARAMETERS:  *Val_desc           - Value to be stored
- *              *Node           - Named object to recieve the value
+ *              *Node           - Named object to receive the value
  *
  * RETURN:      Status
  *
@@ -390,7 +390,7 @@ acpi_aml_store_object_to_index (
  * FUNCTION:    Acpi_aml_store_object_to_node
  *
  * PARAMETERS:  *Source_desc           - Value to be stored
- *              *Node               - Named object to recieve the value
+ *              *Node               - Named object to receive the value
  *
  * RETURN:      Status
  *
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c
index 2a1daa85c..1f63b7fbb 100644
--- a/drivers/acpi/namespace/nsinit.c
+++ b/drivers/acpi/namespace/nsinit.c
@@ -271,7 +271,7 @@ acpi_ns_init_one_device (
 	}
 
 	else {
-		/* Count of successfull INIs */
+		/* Count of successful INIs */
 
 		info->num_INI++;
 	}