Merge commit 'linux-2.6/master' (early part) into oprofile/core

This branch depends on these apic patches:

      apic, x86: Use BIOS settings for IBS and MCE threshold interrupt LVT offsets
      apic, x86: Check if EILVT APIC registers are available (AMD only)

Signed-off-by: Robert Richter <robert.richter@amd.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/m32r/platforms/usrv/setup.c b/arch/m32r/platforms/usrv/setup.c
index 757302660af8..1beac7a51ed4 100644
--- a/arch/m32r/platforms/usrv/setup.c
+++ b/arch/m32r/platforms/usrv/setup.c
@@ -63,7 +63,7 @@ static void shutdown_mappi_irq(unsigned int irq)
 
 static struct irq_chip mappi_irq_type =
 {
-        .typename = "M32700-IRQ",
+        .name = "M32700-IRQ",
         .startup = startup_mappi_irq,
         .shutdown = shutdown_mappi_irq,
         .enable = enable_mappi_irq,
@@ -136,7 +136,7 @@ static void shutdown_m32700ut_pld_irq(unsigned int irq)
 
 static struct irq_chip m32700ut_pld_irq_type =
 {
-        .typename = "USRV-PLD-IRQ",
+        .name = "USRV-PLD-IRQ",
         .startup = startup_m32700ut_pld_irq,
         .shutdown = shutdown_m32700ut_pld_irq,
         .enable = enable_m32700ut_pld_irq,