Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 1ac97018169c5a13feaa90d9671f2d6ba2d9e86e

Authored by Ingo Molnar
Committed by Thomas Gleixner
1 parent c9fea78dc9
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

x86: untangle pci dependencies 

make PCI-less subarches not build with PCI - instead of complicating
the PCI dependencies.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Showing 1 changed file with 4 additions and 5 deletions Side-by-side Diff

... ... @@ -258,7 +258,7 @@
258 258  
259 259 config X86_VOYAGER
260 260 bool "Voyager (NCR)"
261   - depends on X86_32 && (SMP || BROKEN)
  261 + depends on X86_32 && (SMP || BROKEN) && !PCI
262 262 help
263 263 Voyager is an MCA-based 32-way capable SMP architecture proprietary
264 264 to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based.
... ... @@ -300,7 +300,7 @@
300 300  
301 301 config X86_VISWS
302 302 bool "SGI 320/540 (Visual Workstation)"
303   - depends on X86_32
  303 + depends on X86_32 && !PCI
304 304 help
305 305 The SGI Visual Workstation series is an IA32-based workstation
306 306 based on SGI systems chips with some legacy PC hardware attached.
... ... @@ -344,7 +344,7 @@
344 344 config X86_VSMP
345 345 bool "Support for ScaleMP vSMP"
346 346 select PARAVIRT
347   - depends on X86_64
  347 + depends on X86_64 && !PCI
348 348 help
349 349 Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is
350 350 supposed to run on these EM64T-based machines. Only choose this option
... ... @@ -1477,8 +1477,7 @@
1477 1477 menu "Bus options (PCI etc.)"
1478 1478  
1479 1479 config PCI
1480   - bool "PCI support" if !X86_VISWS && !X86_VSMP
1481   - depends on !X86_VOYAGER
  1480 + bool "PCI support"
1482 1481 default y
1483 1482 select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
1484 1483 help