Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2011-08-29 09:44:32 -0400
committerJeff Mahoney <jeffm@suse.com>2011-08-29 09:44:55 -0400
commite82bcac76a8df3046a54981a7e1b84d0898f4939 (patch)
treef7a14a0b7bff9251b99aa7fc239bef731c578bb2
parent0baba30f461c1d24cb5bbdd19aa667825ff9ed1c (diff)
Refresh patches.rpmify/pti-depends-on-x86-pci.
-rw-r--r--patches.rpmify/pti-depends-on-x86-pci8
-rw-r--r--series.conf2
2 files changed, 6 insertions, 4 deletions
diff --git a/patches.rpmify/pti-depends-on-x86-pci b/patches.rpmify/pti-depends-on-x86-pci
index 24a1528dfb..af13b4010c 100644
--- a/patches.rpmify/pti-depends-on-x86-pci
+++ b/patches.rpmify/pti-depends-on-x86-pci
@@ -12,15 +12,17 @@ infrastructure and should depend on PCI as well.
Cc: J Freyensee <james_p_freyensee@linux.intel.com>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
- drivers/misc/Kconfig | 1 +
- 1 file changed, 1 insertion(+)
+
+ drivers/misc/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
-@@ -147,6 +147,7 @@ config PHANTOM
+@@ -147,7 +147,7 @@ config PHANTOM
config INTEL_MID_PTI
tristate "Parallel Trace Interface for MIPI P1149.7 cJTAG standard"
default n
+- depends on PCI
+ depends on X86_INTEL_MID
help
The PTI (Parallel Trace Interface) driver directs
diff --git a/series.conf b/series.conf
index c45c5776fd..113458b276 100644
--- a/series.conf
+++ b/series.conf
@@ -35,7 +35,7 @@
########################################################
patches.rpmify/apm-honor-config_apm_cpu_idle-n
patches.rpmify/nouveau-make-vga_switcheroo-code-depend-on-vga_switcheroo
-# patches.rpmify/pti-depends-on-x86-pci
+ patches.rpmify/pti-depends-on-x86-pci
########################################################
# kABI consistency patches