]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Revert "Merge tag 'integrator-pci-for-arm-soc' of git://git.kernel.org/pub/scm/linux...
authorOlof Johansson <olof@lixom.net>
Sat, 15 Jun 2013 00:09:49 +0000 (17:09 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 15 Jun 2013 00:10:19 +0000 (17:10 -0700)
commit270b699a1e7ed8c361f7c7ef8a70ab700c2a8f89
treefa0d42114e00c324d7cc8f78081d41d06b609913
parenta7f0087f3a47ceed6b6f9d140bb41f9fa537c424
Revert "Merge tag 'integrator-pci-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc"

Dropping by revert -- next/soc has it removed but it's quicker and easier
to revert than to rebuild.

This reverts commit dd0fc05998d3297c0c3ed36a52573ddb7071b90f, reversing
changes made to 5ae13ef4e1045d6ec5d445947b42c839b9731bec.

Signed-off-by: Olof Johansson <olof@lixom.net>
14 files changed:
Documentation/devicetree/bindings/pci/pci.txt [deleted file]
Documentation/devicetree/bindings/pci/v3-v360epc-pci.txt [deleted file]
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/integratorap.dts
arch/arm/include/asm/hardware/pci_v3.h [new file with mode: 0644]
arch/arm/include/asm/mach/pci.h
arch/arm/kernel/bios32.c
arch/arm/mach-integrator/Makefile
arch/arm/mach-integrator/include/mach/platform.h
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/pci.c [new file with mode: 0644]
arch/arm/mach-integrator/pci_v3.c
arch/arm/mach-integrator/pci_v3.h [deleted file]