Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

2 files changed, 2 insertions, 16 deletions

diff --git a/include/asm-mips/mach-cobalt/cobalt.h b/include/asm-mips/mach-cobalt/cobalt.h
index a79e7caf3a86..5b9fce73f11d 100644
--- a/include/asm-mips/mach-cobalt/cobalt.h
+++ b/include/asm-mips/mach-cobalt/cobalt.h
@@ -1,5 +1,5 @@
 /*
- * Lowlevel hardware stuff for the MIPS based Cobalt microservers.
+ * The Cobalt board ID information.
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
@@ -12,9 +12,6 @@
 #ifndef __ASM_COBALT_H
 #define __ASM_COBALT_H
 
-/*
- * The Cobalt board ID information.
- */
 extern int cobalt_board_id;
 
 #define COBALT_BRD_ID_QUBE1    0x3
@@ -22,14 +19,4 @@ extern int cobalt_board_id;
 #define COBALT_BRD_ID_QUBE2    0x5
 #define COBALT_BRD_ID_RAQ2     0x6
 
-#define COBALT_KEY_PORT         ((~*(volatile unsigned int *) CKSEG1ADDR(0x1d000000) >> 24) & COBALT_KEY_MASK)
-# define COBALT_KEY_CLEAR       (1 << 1)
-# define COBALT_KEY_LEFT        (1 << 2)
-# define COBALT_KEY_UP          (1 << 3)
-# define COBALT_KEY_DOWN        (1 << 4)
-# define COBALT_KEY_RIGHT       (1 << 5)
-# define COBALT_KEY_ENTER       (1 << 6)
-# define COBALT_KEY_SELECT      (1 << 7)
-# define COBALT_KEY_MASK        0xfe
-
 #endif /* __ASM_COBALT_H */
diff --git a/include/asm-mips/mach-cobalt/irq.h b/include/asm-mips/mach-cobalt/irq.h
index 179d0e850b59..57c8c9ac5851 100644
--- a/include/asm-mips/mach-cobalt/irq.h
+++ b/include/asm-mips/mach-cobalt/irq.h
@@ -35,7 +35,7 @@
  *      4 - ethernet
  *      5 - 16550 UART
  *      6 - cascade i8259
- *      7 - CP0 counter (unused)
+ *      7 - CP0 counter
  */
 #define MIPS_CPU_IRQ_BASE               16
 
@@ -48,7 +48,6 @@
 #define SCSI_IRQ                        (MIPS_CPU_IRQ_BASE + 5)
 #define I8259_CASCADE_IRQ               (MIPS_CPU_IRQ_BASE + 6)
 
-
 #define GT641XX_IRQ_BASE                24
 
 #include <asm/irq_gt641xx.h>