Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2011-08-24 16:37:54 -0400
committerJeff Mahoney <jeffm@suse.com>2011-08-24 16:39:32 -0400
commite975e4bd16a45bac8417d1a113267189dd6ed2fc (patch)
treed7b9ac61273836c05a7ea1541d760dc75d2924cd
parent58d80737a3c231efc51005fc9de38cc3fbc42ce9 (diff)
- PTI: depends on X86 && PCI.
-rw-r--r--config/i386/vanilla1
-rw-r--r--config/ia64/debug1
-rw-r--r--config/ia64/default1
-rw-r--r--config/ia64/trace1
-rw-r--r--config/ia64/vanilla1
-rw-r--r--config/ppc/default1
-rw-r--r--config/ppc/ppc641
-rw-r--r--config/ppc/vanilla1
-rw-r--r--config/ppc64/debug1
-rw-r--r--config/ppc64/default1
-rw-r--r--config/ppc64/ppc641
-rw-r--r--config/ppc64/trace1
-rw-r--r--config/ppc64/vanilla1
-rw-r--r--config/s390/s3901
-rw-r--r--config/s390/trace1
-rw-r--r--config/s390/vanilla1
-rw-r--r--config/s390x/default1
-rw-r--r--config/s390x/trace1
-rw-r--r--config/s390x/vanilla1
-rw-r--r--config/x86_64/vanilla1
-rw-r--r--patches.rpmify/pti-depends-on-x86-pci28
-rw-r--r--series.conf1
22 files changed, 29 insertions, 20 deletions
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 7fd3dc6084..ca87c77808 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -1632,7 +1632,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ia64/debug b/config/ia64/debug
index e8664c26e8..616b103dc2 100644
--- a/config/ia64/debug
+++ b/config/ia64/debug
@@ -1291,7 +1291,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ia64/default b/config/ia64/default
index cdea91c5a0..ca857e1b66 100644
--- a/config/ia64/default
+++ b/config/ia64/default
@@ -1281,7 +1281,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ia64/trace b/config/ia64/trace
index e2c901887f..6041114f4a 100644
--- a/config/ia64/trace
+++ b/config/ia64/trace
@@ -1281,7 +1281,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ia64/vanilla b/config/ia64/vanilla
index 84691644f8..7046c52176 100644
--- a/config/ia64/vanilla
+++ b/config/ia64/vanilla
@@ -1278,7 +1278,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc/default b/config/ppc/default
index 119ddf80bf..84cdc370a6 100644
--- a/config/ppc/default
+++ b/config/ppc/default
@@ -1224,7 +1224,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc/ppc64 b/config/ppc/ppc64
index 268b02e404..88377c9e40 100644
--- a/config/ppc/ppc64
+++ b/config/ppc/ppc64
@@ -1288,7 +1288,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc/vanilla b/config/ppc/vanilla
index 673ecab9ba..b594df72d7 100644
--- a/config/ppc/vanilla
+++ b/config/ppc/vanilla
@@ -1221,7 +1221,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc64/debug b/config/ppc64/debug
index e7785bbd8c..b8d9d9d197 100644
--- a/config/ppc64/debug
+++ b/config/ppc64/debug
@@ -1252,7 +1252,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc64/default b/config/ppc64/default
index dd069a0877..ce4418051d 100644
--- a/config/ppc64/default
+++ b/config/ppc64/default
@@ -1242,7 +1242,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc64/ppc64 b/config/ppc64/ppc64
index e5cf096535..9bb596432a 100644
--- a/config/ppc64/ppc64
+++ b/config/ppc64/ppc64
@@ -1288,7 +1288,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc64/trace b/config/ppc64/trace
index 9fa0f9d97d..6526390ce1 100644
--- a/config/ppc64/trace
+++ b/config/ppc64/trace
@@ -1288,7 +1288,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 788278a70e..8386df8b2d 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -1239,7 +1239,6 @@ CONFIG_AD525X_DPOT=m
CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
# CONFIG_SGI_IOC4 is not set
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/config/s390/s390 b/config/s390/s390
index d890f2b883..5de3d2e251 100644
--- a/config/s390/s390
+++ b/config/s390/s390
@@ -885,7 +885,6 @@ CONFIG_DASD_EER=y
CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m
CONFIG_MISC_DEVICES=y
-CONFIG_INTEL_MID_PTI=m
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_C2PORT=m
diff --git a/config/s390/trace b/config/s390/trace
index 2c4467683b..a35100c220 100644
--- a/config/s390/trace
+++ b/config/s390/trace
@@ -885,7 +885,6 @@ CONFIG_DASD_EER=y
CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m
CONFIG_MISC_DEVICES=y
-CONFIG_INTEL_MID_PTI=m
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_C2PORT=m
diff --git a/config/s390/vanilla b/config/s390/vanilla
index 420beb5226..4047a5f9a1 100644
--- a/config/s390/vanilla
+++ b/config/s390/vanilla
@@ -893,7 +893,6 @@ CONFIG_DASD_EER=y
CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m
CONFIG_MISC_DEVICES=y
-CONFIG_INTEL_MID_PTI=m
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_C2PORT=m
diff --git a/config/s390x/default b/config/s390x/default
index 9cf5208f22..5aa9178969 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -895,7 +895,6 @@ CONFIG_DASD_EER=y
CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m
CONFIG_MISC_DEVICES=y
-CONFIG_INTEL_MID_PTI=m
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_C2PORT=m
diff --git a/config/s390x/trace b/config/s390x/trace
index 6882d6b22a..9faff12e2a 100644
--- a/config/s390x/trace
+++ b/config/s390x/trace
@@ -895,7 +895,6 @@ CONFIG_DASD_EER=y
CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m
CONFIG_MISC_DEVICES=y
-CONFIG_INTEL_MID_PTI=m
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_C2PORT=m
diff --git a/config/s390x/vanilla b/config/s390x/vanilla
index f36cb5ffb9..e5bef3b0ac 100644
--- a/config/s390x/vanilla
+++ b/config/s390x/vanilla
@@ -893,7 +893,6 @@ CONFIG_DASD_EER=y
CONFIG_VIRTIO_BLK=m
CONFIG_BLK_DEV_RBD=m
CONFIG_MISC_DEVICES=y
-CONFIG_INTEL_MID_PTI=m
CONFIG_ENCLOSURE_SERVICES=m
CONFIG_C2PORT=m
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 2827912f99..067664d361 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -1546,7 +1546,6 @@ CONFIG_AD525X_DPOT_I2C=m
CONFIG_AD525X_DPOT_SPI=m
CONFIG_IBM_ASM=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
diff --git a/patches.rpmify/pti-depends-on-x86-pci b/patches.rpmify/pti-depends-on-x86-pci
new file mode 100644
index 0000000000..24a1528dfb
--- /dev/null
+++ b/patches.rpmify/pti-depends-on-x86-pci
@@ -0,0 +1,28 @@
+From: Jeff Mahoney <jeffm@suse.com>
+Subject: PTI: depends on X86 && PCI
+Patch-mainline: Clarification on dependencies sent to driver author on 24 Aug 2011
+
+Building on ia64 yields this build failure:
+drivers/misc/pti.c:657:3: error: implicit declaration of function 'copy_from_user' [-Werror=implicit-function-declaration]
+
+Since the PTI device is specific to the Penwell type of Intel Atom
+device, make the driver depend on X86. Further, it uses the PCI
+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(+)
+
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
+@@ -147,6 +147,7 @@ config PHANTOM
+ config INTEL_MID_PTI
+ tristate "Parallel Trace Interface for MIPI P1149.7 cJTAG standard"
+ default n
++ depends on X86_INTEL_MID
+ help
+ The PTI (Parallel Trace Interface) driver directs
+ trace data routed from various parts in the system out
+
diff --git a/series.conf b/series.conf
index 5df7bd2cf1..113458b276 100644
--- a/series.conf
+++ b/series.conf
@@ -35,6 +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
########################################################
# kABI consistency patches