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 9441ff9fddc48091b7866a691c0c3401281bb551..2005ff3a6cddbb56b4943b4e7f04117805abdeb5 100644 (file)
--- 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 f62a096fd4a472070d5ac8ad048fd4855d569b55..8d329b33c0385e3f4e57f6c249170c0ebdc5d9d5 100644 (file)
--- 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)