From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 7 Mar 2010 10:20:40 +0000 (+0100)
Subject: compat: fix some build problems with kernel 2.6.24
X-Git-Tag: compat-linux-2.6.34.y~19
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2c567cf7ec8b3f4c774cb95e4815e843da4168ec;p=~emulex%2Ftmp%2Fcompat%2F.git

compat: fix some build problems with kernel 2.6.24

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/compat/Makefile b/compat/Makefile
index 9441ff9..2005ff3 100644
--- a/compat/Makefile
+++ b/compat/Makefile
@@ -12,12 +12,12 @@ compat-$(CONFIG_COMPAT_KERNEL_19) += compat-2.6.19.o
 compat-$(CONFIG_COMPAT_KERNEL_21) += compat-2.6.21.o
 compat-$(CONFIG_COMPAT_KERNEL_22) += compat-2.6.22.o
 compat-$(CONFIG_COMPAT_KERNEL_23) += compat-2.6.23.o
+compat-$(CONFIG_COMPAT_KERNEL_24) += compat-2.6.24.o
 
-compat-$(CONFIG_COMPAT_KERNEL_24) += \
-	compat-2.6.24.o \
+compat-$(CONFIG_COMPAT_KERNEL_25) += \
+	compat-2.6.25.o \
 	pm_qos_params.o
 
-compat-$(CONFIG_COMPAT_KERNEL_25) += compat-2.6.25.o
 compat-$(CONFIG_COMPAT_KERNEL_26) += compat-2.6.26.o
 compat-$(CONFIG_COMPAT_KERNEL_27) += compat-2.6.27.o
 compat-$(CONFIG_COMPAT_KERNEL_28) += compat-2.6.28.o
diff --git a/include/linux/compat-2.6.25.h b/include/linux/compat-2.6.25.h
index f62a096..8d329b3 100644
--- a/include/linux/compat-2.6.25.h
+++ b/include/linux/compat-2.6.25.h
@@ -27,7 +27,7 @@
  * in a generic manner.
  */
 #define DEFINE_PCI_DEVICE_TABLE(_table) \
-	struct pci_device_id _table[] __devinitdata
+	const struct pci_device_id _table[] __devinitdata
 
 /*
  * Backport work for QoS dependencies (kernel/pm_qos_params.c)