summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-07-20 00:42:46 -0700
committerTrent Piepho <xyzzy@speakeasy.org>2007-07-20 00:42:46 -0700
commit8a55acadcb3c75ee7a84683f612607957468a132 (patch)
tree858a45701bfb75927010d02369cac493cfd4b5ee /v4l
parent1079247820cf7d49cc44f78477fd0da737fbabd5 (diff)
downloadmediapointer-dvb-s2-8a55acadcb3c75ee7a84683f612607957468a132.tar.gz
mediapointer-dvb-s2-8a55acadcb3c75ee7a84683f612607957468a132.tar.bz2
compat: keep printing pci revision on older kernels
From: Trent Piepho <xyzzy@speakeasy.org> In 2.6.23, there is a new struct pci_dev->revision field to get the pci revision. A couple drivers now use this to print the revision and on old kernels don't print it anymore. This patch adds a simple function to get the revision to compat.h to make it easy for the backward compay code to keep printing the revision like is used too. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/compat.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/v4l/compat.h b/v4l/compat.h
index ed6605687..b788e7be2 100644
--- a/v4l/compat.h
+++ b/v4l/compat.h
@@ -389,6 +389,15 @@ typedef int bool;
#define pci_match_device(drv, dev) pci_match_device((drv)->id_table, dev)
#endif
+/* pci_dev got a new revision field in 2.6.23-rc1 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) && defined(LINUX_PCI_H)
+/* Just make it easier to subsitute pci_dev->revision with
+ * v4l_compat_pci_rev(pci_dev). It's too bad there isn't some kind of context
+ * sensitive macro in C that could do this for us. */
+static inline u8 v4l_compat_pci_rev(struct pci_dev *pci)
+{ u8 rev; pci_read_config_byte(pci, PCI_REVISION_ID, &rev); return rev; }
+#endif
+
#endif
/*
* Local variables: