alistair23-linux/arch/microblaze/include/asm
Linus Torvalds 7b67e75147 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits)
  x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
  PCI: Increase resource array mask bit size in pcim_iomap_regions()
  PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES
  PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
  PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
  x86/PCI: amd: factor out MMCONFIG discovery
  PCI: Enable ATS at the device state restore
  PCI: msi: fix imbalanced refcount of msi irq sysfs objects
  PCI: kconfig: English typo in pci/pcie/Kconfig
  PCI/PM/Runtime: make PCI traces quieter
  PCI: remove pci_create_bus()
  xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources
  x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()
  x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
  x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan
  sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources
  sparc/PCI: convert to pci_create_root_bus()
  sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
  powerpc/PCI: convert to pci_create_root_bus()
  powerpc/PCI: split PHB part out of pcibios_map_io_space()
  ...

Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due
to the same patches being applied in other branches.
2012-01-11 18:50:26 -08:00
..
asm-compat.h microblaze: Copy ppc asm-compat.h for clean handling of constants in asm and C 2009-09-22 10:10:06 +02:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
atomic.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
auxvec.h microblaze: Fix problem with removing zero length files 2009-04-14 10:37:09 +02:00
bitops.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
bitsperlong.h asm-generic: introduce asm/bitsperlong.h 2009-06-11 21:02:14 +02:00
bug.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
bugs.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
byteorder.h microblaze: Add support for little-endian Microblaze 2010-10-21 15:51:59 +10:00
cache.h microblaze: Define correct L1_CACHE_SHIFT value 2010-05-06 11:21:59 +02:00
cacheflush.h microblaze: trivial: Add one empty line 2011-03-09 08:09:57 +01:00
checksum.h microblaze: Add support for little-endian Microblaze 2010-10-21 15:51:59 +10:00
clinkage.h microblaze_v8: clinkage.h linkage.h sections.h kmap_types.h 2009-03-27 14:25:38 +01:00
cpuinfo.h microblaze: Unprivileged stream instruction awareness 2011-07-25 09:13:42 +02:00
cputable.h microblaze: Fix problem with removing zero length files 2009-04-14 10:37:09 +02:00
cputime.h microblaze_v8: headers simple files - empty or redirect to asm-generic 2009-03-27 14:25:41 +01:00
current.h microblaze_mmu_v2: Add CURRENT_TASK for entry.S 2009-05-26 16:45:19 +02:00
delay.h microblaze_v8: delay.h, timex.h 2009-03-27 14:25:27 +01:00
device.h arch/microblaze: Move dma_mask from of_device into pdev_archdata 2010-05-22 00:10:40 -06:00
div64.h microblaze_v8: headers simple files - empty or redirect to asm-generic 2009-03-27 14:25:41 +01:00
dma-mapping.h Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 2011-10-31 16:13:44 -07:00
dma.h microblaze: Add isa_dma_bridge_buggy to dma.h 2010-05-06 11:21:58 +02:00
elf.h microblaze: Switch ELF_ARCH code to 189 2011-10-14 12:24:31 +02:00
emergency-restart.h microblaze_v8: headers simple files - empty or redirect to asm-generic 2009-03-27 14:25:41 +01:00
entry.h microblaze: Remove r0_ram pointer and PTO alignment 2011-03-09 08:09:54 +01:00
errno.h microblaze_v8: headers simple files - empty or redirect to asm-generic 2009-03-27 14:25:41 +01:00
exceptions.h microblaze: Fix sparse warning - fault.c 2011-03-09 08:09:59 +01:00
fb.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
fcntl.h microblaze_v8: fcntl.h sockios.h ucontext.h 2009-03-27 14:25:45 +01:00
flat.h microblaze: remove unused flat_stack_align() definition 2009-06-02 07:54:36 +02:00
ftrace.h microblaze: ftrace: Add dynamic trace support 2009-12-14 08:44:01 +01:00
futex.h futex: Sanitize futex ops argument types 2011-03-11 12:23:31 +01:00
gpio.h microblaze: support gpio_to_irq() 2010-10-21 15:51:41 +10:00
hardirq.h microblaze: use the generic ack_bad_irq implementation 2009-08-18 10:33:29 +02:00
hw_irq.h microblaze: Fix problem with removing zero length files 2009-04-14 10:37:09 +02:00
io.h Fix common misspellings 2011-03-31 11:26:23 -03:00
ioctl.h microblaze_v8: ioctl support 2009-03-27 14:25:33 +01:00
ioctls.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
ipcbuf.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
irq.h microblaze: Remove NO_IRQ from architecture 2012-01-05 08:34:31 +01:00
irq_regs.h microblaze_v8: headers for irq 2009-03-27 14:25:35 +01:00
irqflags.h microblaze/irqs: Do not trace arch_local_{*,irq_*} functions 2011-07-25 09:07:45 +02:00
Kbuild microblaze: Kbuild update 2009-05-22 09:50:46 +02:00
kdebug.h microblaze_v8: headers simple files - empty or redirect to asm-generic 2009-03-27 14:25:41 +01:00
kgdb.h microblaze: Add KGDB support 2010-08-04 10:45:17 +02:00
kmap_types.h kmap_types: make most arches use generic header file 2009-06-16 19:47:51 -07:00
linkage.h microblaze_v8: clinkage.h linkage.h sections.h kmap_types.h 2009-03-27 14:25:38 +01:00
local.h microblaze_v8: headers simple files - empty or redirect to asm-generic 2009-03-27 14:25:41 +01:00
local64.h arch: Implement local64_t 2010-06-09 11:12:36 +02:00
mman.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
mmu.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
mmu_context.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
mmu_context_mm.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
module.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
msgbuf.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
mutex.h microblaze_v8: headers simple files - empty or redirect to asm-generic 2009-03-27 14:25:41 +01:00
page.h microblaze: Synchronize __pa __va macros 2012-01-05 08:21:59 +01:00
param.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
parport.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
pci-bridge.h microblaze/PCI: make pcibios_setup_phb_resources() static 2012-01-06 12:11:00 -08:00
pci.h PCI: MicroBlaze: convert pcibios_set_master() to a non-inlined function 2012-01-06 12:10:38 -08:00
percpu.h microblaze_v8: headers simple files - empty or redirect to asm-generic 2009-03-27 14:25:41 +01:00
pgalloc.h microblaze: Fix pmd_populate macro 2010-10-21 15:51:20 +10:00
pgtable.h microblaze: Fix sparse warning - consistent_alloc function 2011-03-09 08:09:58 +01:00
poll.h microblaze_v8: pool.h socket.h 2009-03-27 14:25:44 +01:00
posix_types.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
processor.h microblaze: Remove duplicated prototype of start_thread() 2011-07-25 09:07:45 +02:00
prom.h Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 2011-07-27 09:24:20 -07:00
ptrace.h ptrace: unify show_regs() prototype 2011-07-26 16:49:43 -07:00
pvr.h microblaze: Unprivileged stream instruction awareness 2011-07-25 09:13:42 +02:00
registers.h microblaze_mmu_v2: Update process creation for MMU 2009-05-26 16:45:18 +02:00
resource.h microblaze_v8: headers simple files - empty or redirect to asm-generic 2009-03-27 14:25:41 +01:00
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
seccomp.h microblaze: Add seccomp support 2010-10-21 15:51:25 +10:00
sections.h microblaze_mmu_v2: Page table - ioremap - pgtable.c/h, section update 2009-05-26 16:45:16 +02:00
selfmod.h microblaze_v8: Selfmodified code 2009-03-27 14:25:15 +01:00
sembuf.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
serial.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
setup.h microblaze: Remove eprintk macro 2012-01-05 08:34:26 +01:00
shmbuf.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
shmparam.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
sigcontext.h microblaze_v8: sigcontext.h siginfo.h 2009-03-27 14:25:40 +01:00
siginfo.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
signal.h microblaze: clean up signal handling 2009-07-06 10:26:57 +02:00
socket.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
sockios.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
stat.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
statfs.h microblaze_v8: stats headers 2009-03-27 14:25:39 +01:00
string.h microblaze: Guard __HAVE_ARCH macros with __KERNEL__ in string.h 2009-05-21 15:56:08 +02:00
swab.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
syscall.h microblaze: Fix sparse warnings - ptrace 2011-03-09 08:09:58 +01:00
syscalls.h microblaze: Fix missing microblaze specific syscalls declaration 2011-03-09 08:09:58 +01:00
system.h microblaze: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW usage 2011-10-14 12:28:42 +02:00
termbits.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
termios.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
thread_info.h freezer: remove now unused TIF_FREEZE 2011-11-21 12:32:25 -08:00
timex.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
tlb.h microblaze: Fix missing pagemap.h 2011-01-16 14:29:21 +01:00
tlbflush.h microblaze: Fix TLB macros 2010-04-01 08:38:24 +02:00
topology.h of: Provide default of_node_to_nid() implementation. 2010-07-30 00:03:58 -06:00
types.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
uaccess.h microblaze: Fix access_ok macro 2011-10-14 12:24:27 +02:00
ucontext.h microblaze: fall back on generic header files for the ABI 2009-07-06 10:26:50 +02:00
unaligned.h microblaze: Fix unaligned.h for endians 2011-03-09 08:09:53 +01:00
unistd.h microblaze: Wire-up new system calls 2012-01-05 11:16:51 +01:00
unwind.h microblaze: Add stack unwinder 2010-08-04 10:22:35 +02:00
user.h microblaze: Fix problem with removing zero length files 2009-04-14 10:37:09 +02:00
vga.h microblaze: convert all simple headers to use asm-generic 2009-07-06 10:26:55 +02:00
xor.h microblaze_v8: headers simple files - empty or redirect to asm-generic 2009-03-27 14:25:41 +01:00