Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8364919c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 

* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
  USB: EHCI: Don't use NO_IRQ in xilinx ehci driver
  microblaze: Add topology init
parents d3569d16 7f788ec0

arch/microblaze/kernel/setup.c

+20 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/cache.h>

#include <linux/of_platform.h>

#include <linux/dma-mapping.h>

#include <linux/cpu.h>

#include <asm/cacheflush.h>

#include <asm/entry.h>

#include <asm/cpuinfo.h>
@@ -226,5 +227,23 @@ static int __init setup_bus_notifier(void) 


	return 0;

}



arch_initcall(setup_bus_notifier);



static DEFINE_PER_CPU(struct cpu, cpu_devices);



static int __init topology_init(void)

{

	int i, ret;



	for_each_present_cpu(i) {

		struct cpu *c = &per_cpu(cpu_devices, i);



		ret = register_cpu(c, i);

		if (ret)

			printk(KERN_WARNING "topology_init: register_cpu %d "

						"failed (%d)\n", i, ret);

	}



	return 0;

}

subsys_initcall(topology_init);

drivers/usb/host/ehci-xilinx-of.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int __devinit ehci_hcd_xilinx_of_probe(struct platform_device *op) 
	}



	irq = irq_of_parse_and_map(dn, 0);

	if (irq == NO_IRQ) {

	if (!irq) {

		printk(KERN_ERR "%s: irq_of_parse_and_map failed\n", __FILE__);

		rv = -EBUSY;

		goto err_irq;