--- a/drivers/char/pc_keyb.c	2007-04-24 15:47:49.000000000 -0400
+++ b/drivers/char/pc_keyb.c	2007-04-24 15:30:24.000000000 -0400
@@ -61,6 +61,14 @@ unsigned char pckbd_sysrq_xlate[128] =
 	"\r\000/";					/* 0x60 - 0x6f */
 #endif
 
+int keyboard_controller_present __initdata = 1;
+static int __init removable_keyb(char *str)
+{
+        keyboard_controller_present = 0;
+        return 0;
+}
+__setup("nokeyb", removable_keyb);
+
 static void kbd_write_command_w(int data);
 static void kbd_write_output_w(int data);
 #ifdef CONFIG_PSMOUSE
@@ -69,9 +77,8 @@ static void __aux_write_ack(int val);
 static int aux_reconnect = 0;
 #endif
 
-#ifndef kbd_controller_present
-#define kbd_controller_present()	1
-#endif
+#define kbd_controller_present() keyboard_controller_present
+
 static spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED;
 static unsigned char handle_kbd_event(void);
 
@@ -898,7 +905,7 @@ static char * __init initialize_kbd(void
 
 void __init pckbd_init_hw(void)
 {
-	if (!kbd_controller_present()) {
+	if (!keyboard_controller_present) {
 		kbd_exists = 0;
 		return;
 	}
--- a/arch/i386/kernel/dmi_scan.c	2007-04-24 15:47:04.000000000 -0400
+++ b/arch/i386/kernel/dmi_scan.c	2007-04-24 15:30:24.000000000 -0400
@@ -524,6 +524,21 @@ static __init int disable_acpi_pci(struc
  */
  
 
+/*      IBM bladeservers have a USB console switch. The keyboard type is USB
+ *      and the hardware does not have a console keyboard. We disable the
+ *      console keyboard so the kernel does not try to initialize one and
+ *      spew errors. This can be used for all systems without a console
+ *      keyboard like systems with just a USB or IrDA keyboard.
+ */
+static __init int disable_console_keyboard(struct dmi_blacklist *d)
+{
+        extern int keyboard_controller_present;
+        printk(KERN_INFO "*** Hardware has no console keyboard controller.\n");
+        printk(KERN_INFO "*** Disabling console keyboard.\n");
+        keyboard_controller_present = 0;
+        return 0;
+}
+
 /*
  *	This will be expanded over time to force things like the APM 
  *	interrupt mask settings according to the laptop
@@ -810,6 +825,15 @@ static __initdata struct dmi_blacklist d
 			MATCH(DMI_SYS_VENDOR, "IBM"),
 			NO_MATCH, NO_MATCH, NO_MATCH
 			} },
+ /*
+         *      IBM Bladeservers
+         */
+
+        { disable_console_keyboard, "IBM Server Blade", {
+                        MATCH(DMI_SYS_VENDOR,"IBM"),
+                        MATCH(DMI_BOARD_NAME, "Server Blade"),
+                        NO_MATCH, NO_MATCH
+                        } },
 
 #ifdef	CONFIG_ACPI_BOOT
 	/*
 
--- a/Documentation/kernel-parameters.txt	2007-04-25 12:49:22.000000000 -0400
+++ b/Documentation/kernel-parameters.txt	2007-04-25 13:02:53.000000000 -0400
@@ -430,6 +430,10 @@ running once the system is up.
 			initial RAM disk.
 
 	nointroute	[IA-64]
+
+	nokeyb		[HW] Skip console keyboard initialization for systems 
+			without a console keyboard, removable keyboard, or 
+			bladecenters with a USB console keyboard switch, etc.
  
 	nolapic		[IA-32,APIC] Do not enable or use the local APIC.