From 1d4691c2589863764347e7e801ad52857ac0dff3 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 29 Sep 2010 18:44:23 +0200
Subject: [PATCH] --- yaml --- r: 212219 b: refs/heads/master c:
 b7d0d8258a9f71949b810e0f82a3d75088f4d364 h: refs/heads/master i:   212217:
 36480f2f8ea3357cccc20ec780c3b2d2116ab254   212215:
 7f8a7253fa454ba6b320c8f7bb3da1e0d9170f31 v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/interrupt.h | 3 ---
 trunk/kernel/irq/irqdesc.c      | 2 --
 trunk/kernel/softirq.c          | 5 -----
 4 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index c183d2c3f589..e8a7b2b35bc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77dff1c755c3218691e95e7e38ee14323b35dbdb
+refs/heads/master: b7d0d8258a9f71949b810e0f82a3d75088f4d364
diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h
index a0384a4d1e6f..19988983aeac 100644
--- a/trunk/include/linux/interrupt.h
+++ b/trunk/include/linux/interrupt.h
@@ -641,11 +641,8 @@ static inline void init_irq_proc(void)
 struct seq_file;
 int show_interrupts(struct seq_file *p, void *v);
 
-struct irq_desc;
-
 extern int early_irq_init(void);
 extern int arch_probe_nr_irqs(void);
 extern int arch_early_irq_init(void);
-extern int arch_init_chip_data(struct irq_desc *desc, int node);
 
 #endif
diff --git a/trunk/kernel/irq/irqdesc.c b/trunk/kernel/irq/irqdesc.c
index a1fbd1d347af..6c71f8ea5d7d 100644
--- a/trunk/kernel/irq/irqdesc.c
+++ b/trunk/kernel/irq/irqdesc.c
@@ -197,8 +197,6 @@ static int alloc_descs(unsigned int start, unsigned int cnt, int node)
 		desc = alloc_desc(start + i, node);
 		if (!desc)
 			goto err;
-		/* temporary until I fixed x86 madness */
-		arch_init_chip_data(desc, node);
 		raw_spin_lock_irqsave(&sparse_irq_lock, flags);
 		irq_insert_desc(start + i, desc);
 		raw_spin_unlock_irqrestore(&sparse_irq_lock, flags);
diff --git a/trunk/kernel/softirq.c b/trunk/kernel/softirq.c
index 14a7b80b2cce..d19b1c9aa7c5 100644
--- a/trunk/kernel/softirq.c
+++ b/trunk/kernel/softirq.c
@@ -896,9 +896,4 @@ int __init __weak arch_early_irq_init(void)
 {
 	return 0;
 }
-
-int __weak arch_init_chip_data(struct irq_desc *desc, int node)
-{
-	return 0;
-}
 #endif