git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xfs-4.15-merge-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-integrator
/
Makefile
diff --git
a/arch/arm/mach-integrator/Makefile
b/arch/arm/mach-integrator/Makefile
index a5a4470db482b6be9eb12a87627bfd0bb6ed4c33..71b97ffe8d32c23b8c81a4d989bf3746573aa5a7 100644
(file)
--- a/
arch/arm/mach-integrator/Makefile
+++ b/
arch/arm/mach-integrator/Makefile
@@
-8,6
+8,4
@@
obj-y := core.o lm.o
obj-$(CONFIG_ARCH_INTEGRATOR_AP) += integrator_ap.o
obj-$(CONFIG_ARCH_INTEGRATOR_CP) += integrator_cp.o
-
-obj-$(CONFIG_PCI) += pci_v3.o
obj-$(CONFIG_INTEGRATOR_IMPD1) += impd1.o