Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6: IXP4xx: GTWX5715 platform only has two PCI IRQ lines, not four. IXP4xx: Introduce IXP4XX_GPIO_IRQ(n) macro and convert IXP4xx platform files. IXP4xx: move Gemtek GTWX5715 platform macros to the platform code. IXP4xx: Remove unused Motorola PrPMC1100 platform macros. IXP4xx: move FSG platform macros to the platform code. IXP4xx: move DSM G600 platform macros to the platform code. IXP4xx: move NAS100D platform macros to the platform code. IXP4xx: move NSLU2 platform macros to the platform code. IXP4xx: move Coyote platform macros to the platform code. IXP4xx: move AVILA platform macros to the platform code. IXP4xx: move IXDP425 platform macros to the platform code. IXP4xx: Extend PCI MMIO indirect address space to 1 GB. IXP4xx: Fix compilation failure with CONFIG_IXP4XX_INDIRECT_PCI. IXP4xx: Drop "__ixp4xx_" prefix from in/out/ioread/iowrite functions for clarity. IXP4xx: Rename indirect MMIO primitives from __ixp4xx_* to __indirect_*. IXP4xx: Ensure index is positive in irq_to_gpio() and npe_request(). ARM: fix insl() and outsl() endianness on IXP4xx architecture. IXP4xx: Fix normally-disabled debugging text in drivers/net/arm/ixp4xx_eth.c. IXP4xx: change the timer base frequency to 66.666000 MHz.
Showing
- arch/arm/mach-ixp4xx/include/mach/hardware.h 7 additions, 11 deletionsarch/arm/mach-ixp4xx/include/mach/hardware.h
- arch/arm/mach-ixp4xx/include/mach/io.h 133 additions, 174 deletionsarch/arm/mach-ixp4xx/include/mach/io.h
- arch/arm/mach-ixp4xx/include/mach/irqs.h 3 additions, 66 deletionsarch/arm/mach-ixp4xx/include/mach/irqs.h
- arch/arm/mach-ixp4xx/include/mach/ixdp425.h 0 additions, 39 deletionsarch/arm/mach-ixp4xx/include/mach/ixdp425.h
- arch/arm/mach-ixp4xx/include/mach/nas100d.h 0 additions, 52 deletionsarch/arm/mach-ixp4xx/include/mach/nas100d.h
- arch/arm/mach-ixp4xx/include/mach/npe.h 1 addition, 1 deletionarch/arm/mach-ixp4xx/include/mach/npe.h
- arch/arm/mach-ixp4xx/include/mach/nslu2.h 0 additions, 55 deletionsarch/arm/mach-ixp4xx/include/mach/nslu2.h
- arch/arm/mach-ixp4xx/include/mach/prpmc1100.h 0 additions, 33 deletionsarch/arm/mach-ixp4xx/include/mach/prpmc1100.h
- arch/arm/mach-ixp4xx/include/mach/timex.h 1 addition, 1 deletionarch/arm/mach-ixp4xx/include/mach/timex.h
- arch/arm/mach-ixp4xx/ixdp425-pci.c 23 additions, 20 deletionsarch/arm/mach-ixp4xx/ixdp425-pci.c
- arch/arm/mach-ixp4xx/ixdp425-setup.c 10 additions, 2 deletionsarch/arm/mach-ixp4xx/ixdp425-setup.c
- arch/arm/mach-ixp4xx/ixp4xx_npe.c 1 addition, 1 deletionarch/arm/mach-ixp4xx/ixp4xx_npe.c
- arch/arm/mach-ixp4xx/nas100d-pci.c 23 additions, 18 deletionsarch/arm/mach-ixp4xx/nas100d-pci.c
- arch/arm/mach-ixp4xx/nas100d-setup.c 15 additions, 1 deletionarch/arm/mach-ixp4xx/nas100d-setup.c
- arch/arm/mach-ixp4xx/nslu2-pci.c 19 additions, 16 deletionsarch/arm/mach-ixp4xx/nslu2-pci.c
- arch/arm/mach-ixp4xx/nslu2-setup.c 20 additions, 1 deletionarch/arm/mach-ixp4xx/nslu2-setup.c
- drivers/leds/leds-fsg.c 7 additions, 0 deletionsdrivers/leds/leds-fsg.c
- drivers/net/arm/ixp4xx_eth.c 1 addition, 1 deletiondrivers/net/arm/ixp4xx_eth.c
Loading
Please register or sign in to comment