diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 13:11:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-17 13:11:25 -0400 |
| commit | 7b7adc4a016a1decb806eb71ecab98721fa7f146 (patch) | |
| tree | 0a6f9a6e5659faa94604fbc575382a18f143c657 /drivers/pci | |
| parent | 31598e8713ef501c8f6aad2e2ec8a9457e8877c1 (diff) | |
| parent | 289d6b0e287e0acd85f3e6b7ea6c2cb5c234909a (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32: (40 commits)
unicore32: rewrite arch-specific tlb.h to use asm-generic version
unicore32: modify io_p2v and io_v2p macros, and adjust PKUNITY_mmio_BASEs
unicore32: replace unicore32-specific iomap functions with generic lib implementation
unicore32 machine related: add frame buffer driver for pkunity-v3 soc
unicore32 machine related files: add i2c bus drivers for pkunity-v3 soc
unicore32 io: redefine __REG(x) and re-use readl/writel funcs
unicore32 i8042 upgrade and bugfix: adjust resource request region type
unicore32 upgrade to v2.6.38-rc5: add one more paramter for pte_alloc_map call
unicore32 i8042: adjust io funcs of i8042-unicore32io.h
unicore32: rename PKUNITY_IOSPACE_BASE to PKUNITY_MMIO_BASE
unicore32: modify function names and parameters for irq_chips
unicore32: remove unused lines in arch/unicore32/include/asm/irq.h
unicore32 time.c: change calculate method for clock_event_device
unicore32: ADD MAINTAINER for unicore32 architecture
unicore32 machine related files: ps2 driver
unicore32 machine related files: pci bus handling
unicore32 machine related files: hardware registers
unicore32 machine related files: core files
unicore32 additional architecture files: boot process
unicore32 additional architecture files: low-level lib: misc
...
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 98e6fdf34d30..77cf813ba264 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile | |||
| @@ -42,6 +42,7 @@ obj-$(CONFIG_PCI_IOV) += iov.o | |||
| 42 | obj-$(CONFIG_X86) += setup-bus.o | 42 | obj-$(CONFIG_X86) += setup-bus.o |
| 43 | obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o | 43 | obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o |
| 44 | obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o | 44 | obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o |
| 45 | obj-$(CONFIG_UNICORE32) += setup-bus.o setup-irq.o | ||
| 45 | obj-$(CONFIG_PARISC) += setup-bus.o | 46 | obj-$(CONFIG_PARISC) += setup-bus.o |
| 46 | obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o | 47 | obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o |
| 47 | obj-$(CONFIG_PPC) += setup-bus.o | 48 | obj-$(CONFIG_PPC) += setup-bus.o |