---

yaml --- r: 31080 b: refs/heads/master c: f1c2662 h: refs/heads/master v: v3
git-mirror · Jun 29, 2006 · 7533dc9 · 7533dc9
1 parent e468bb6
commit 7533dc9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e76de9f8eb67b7acc1cc6f28c4be8583adf0a90c
+refs/heads/master: f1c2662cbc6a0a9772655649bdf579803d33470b
diff --git a/trunk/kernel/irq/handle.c b/trunk/kernel/irq/handle.c
@@ -45,7 +45,7 @@ handle_bad_irq(unsigned int irq, struct irq_desc *desc, struct pt_regs *regs)
 struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned = {
 	[0 ... NR_IRQS-1] = {
 		.status = IRQ_DISABLED,
-		.chip = &no_irq_type,
+		.chip = &no_irq_chip,
 		.handle_irq = handle_bad_irq,
 		.depth = 1,
 		.lock = SPIN_LOCK_UNLOCKED,
@@ -79,8 +79,8 @@ static unsigned int noop_ret(unsigned int irq)
 /*
  * Generic no controller implementation
  */
-struct hw_interrupt_type no_irq_type = {
-	.typename	= "none",
+struct irq_chip no_irq_chip = {
+	.name		= "none",
 	.startup	= noop_ret,
 	.shutdown	= noop,
 	.enable		= noop,

diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
@@ -199,7 +199,7 @@ int setup_irq(unsigned int irq, struct irqaction *new)
 	if (irq >= NR_IRQS)
 		return -EINVAL;
 
-	if (desc->chip == &no_irq_type)
+	if (desc->chip == &no_irq_chip)
 		return -ENOSYS;
 	/*
 	 * Some drivers like serial.c use request_irq() heavily,

diff --git a/trunk/kernel/irq/proc.c b/trunk/kernel/irq/proc.c
@@ -117,7 +117,7 @@ void register_irq_proc(unsigned int irq)
 	char name [MAX_NAMELEN];
 
 	if (!root_irq_dir ||
-		(irq_desc[irq].chip == &no_irq_type) ||
+		(irq_desc[irq].chip == &no_irq_chip) ||
 			irq_desc[irq].dir)
 		return;