---

yaml --- r: 31865 b: refs/heads/master c: 0ebfff1 h: refs/heads/master i: 31863: 9efb14c v: v3
git-mirror · Jul 3, 2006 · 2fb051f · 2fb051f
1 parent d11a915
commit 2fb051f
Show file tree

Hide file tree

Showing 58 changed files with 2,830 additions and 2,127 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f63e115fb50db39706b955b81e3375ef6bab2268
+refs/heads/master: 0ebfff1491ef85d41ddf9c633834838be144f69f
diff --git a/trunk/arch/powerpc/kernel/ibmebus.c b/trunk/arch/powerpc/kernel/ibmebus.c
@@ -323,26 +323,21 @@ int ibmebus_request_irq(struct ibmebus_dev *dev,
 			unsigned long irq_flags, const char * devname,
 			void *dev_id)
 {
-	unsigned int irq = virt_irq_create_mapping(ist);
+	unsigned int irq = irq_create_mapping(NULL, ist, 0);
 
 	if (irq == NO_IRQ)
 		return -EINVAL;
 
-	irq = irq_offset_up(irq);
-
 	return request_irq(irq, handler,
 			   irq_flags, devname, dev_id);
 }
 EXPORT_SYMBOL(ibmebus_request_irq);
 
 void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id)
 {
-	unsigned int irq = virt_irq_create_mapping(ist);
+	unsigned int irq = irq_find_mapping(NULL, ist);
 
-	irq = irq_offset_up(irq);
 	free_irq(irq, dev_id);
-
-	return;
 }
 EXPORT_SYMBOL(ibmebus_free_irq);