Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 283655
b: refs/heads/master
c: 5cf9a4e
h: refs/heads/master
i:
  283653: 6be15a7
  283651: d54efe9
  283647: 0f6bd03
v: v3
  • Loading branch information
Bjorn Helgaas authored and Linus Torvalds committed Jan 12, 2012
1 parent 14c59a7 commit 7bb9397
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c4d285ad5665bfbd983b95fde8d7a477d24a361
refs/heads/master: 5cf9a4e69c1ff0ccdd1d2b7404f95c0531355274
3 changes: 2 additions & 1 deletion trunk/arch/x86/pci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
obj-$(CONFIG_X86_INTEL_MID) += mrst.o

obj-y += common.o early.o
obj-y += amd_bus.o bus_numa.o
obj-y += bus_numa.o

obj-$(CONFIG_AMD_NB) += amd_bus.o
obj-$(CONFIG_PCI_CNB20LE_QUIRK) += broadcom_bus.o

ifeq ($(CONFIG_PCI_DEBUG),y)
Expand Down

0 comments on commit 7bb9397

Please sign in to comment.