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

Commit 22a60f19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] switch to new pci_get_bus_and_slot API
  [ARM] Update mach-types
  [ARM] Fix Zaurii keyboard/touchscreen drivers
  [ARM] Fix fallout from IRQ regs changes
  [ARM] 3890/1: [Jornada7xx] Addition of MCU commands into jornada720.h
  [ARM] 3889/1: [Jornada7xx] Addition of correct SDRAM params into cpu-sa1110.c
  [ARM] 3888/1: add pxa27x SSP FSRT register bit definition
parents 4e4bc305 7281c248

arch/arm/mach-footbridge/dc21285.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/slab.h>

#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/irq.h>



#include <asm/io.h>

#include <asm/irq.h>

arch/arm/mach-ixp2000/ixdp2400.c

+4 −2
Original line number Diff line number Diff line
@@ -133,11 +133,13 @@ static void ixdp2400_pci_postinit(void) 
	struct pci_dev *dev;



	if (ixdp2x00_master_npu()) {

		dev = pci_find_slot(1, IXDP2400_SLAVE_ENET_DEVFN);

		dev = pci_get_bus_and_slot(1, IXDP2400_SLAVE_ENET_DEVFN);

		pci_remove_bus_device(dev);

		pci_dev_put(dev)

	} else {

		dev = pci_find_slot(1, IXDP2400_MASTER_ENET_DEVFN);

		dev = pci_get_bus_and_slot(1, IXDP2400_MASTER_ENET_DEVFN);

		pci_remove_bus_device(dev);

		pci_dev_put(dev)



		ixdp2x00_slave_pci_postinit();

	}

arch/arm/mach-ixp2000/ixdp2800.c

+4 −2
Original line number Diff line number Diff line
@@ -261,14 +261,16 @@ int __init ixdp2800_pci_init(void) 


		pci_common_init(&ixdp2800_pci);

		if (ixdp2x00_master_npu()) {

			dev = pci_find_slot(1, IXDP2800_SLAVE_ENET_DEVFN);

			dev = pci_get_bus_and_slot(1, IXDP2800_SLAVE_ENET_DEVFN);

			pci_remove_bus_device(dev);

			pci_dev_put(dev);



			ixdp2800_master_enable_slave();

			ixdp2800_master_wait_for_slave_bus_scan();

		} else {

			dev = pci_find_slot(1, IXDP2800_MASTER_ENET_DEVFN);

			dev = pci_get_bus_and_slot(1, IXDP2800_MASTER_ENET_DEVFN);

			pci_remove_bus_device(dev);

			pci_dev_put(dev);

		}

	}

arch/arm/mach-ixp2000/ixdp2x00.c

+5 −2
Original line number Diff line number Diff line
@@ -241,11 +241,14 @@ void ixdp2x00_slave_pci_postinit(void) 
	/*

	 * Remove PMC device is there is one

	 */

	if((dev = pci_find_slot(1, IXDP2X00_PMC_DEVFN)))

	if((dev = pci_get_bus_and_slot(1, IXDP2X00_PMC_DEVFN))) {

		pci_remove_bus_device(dev);

		pci_dev_put(dev);

	}



	dev = pci_find_slot(0, IXDP2X00_21555_DEVFN);

	dev = pci_get_bus_and_slot(0, IXDP2X00_21555_DEVFN);

	pci_remove_bus_device(dev);

	pci_dev_put(dev);

}



/**************************************************************************

arch/arm/mach-pxa/lubbock.c

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static void lubbock_mmc_poll(unsigned long data) 
	if (LUB_IRQ_SET_CLR & (1 << 0))

		mod_timer(&mmc_timer, jiffies + MMC_POLL_RATE);

	else {

		(void) mmc_detect_int(LUBBOCK_SD_IRQ, (void *)data, NULL);

		(void) mmc_detect_int(LUBBOCK_SD_IRQ, (void *)data);

		enable_irq(LUBBOCK_SD_IRQ);

	}

}