rename COMPAT_ to BACKPORT_ in internal Kconfig symbols

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

diff --git a/compat/compat/Kconfig b/compat/compat/Kconfig
index b8da417dfea7990a43290a742d2bfe11fe2a33ae..6d1bda604ef391e83f333c5251bab342fcf69d34 100644 (file)
--- a/compat/compat/Kconfig
+++ b/compat/compat/Kconfig
@@ -1,30 +1,30 @@
-config COMPAT_FIRMWARE_CLASS
+config BACKPORT_FIRMWARE_CLASS
        tristate
        default m if FIRMWARE_CLASS=m
 
-config COMPAT_NET_SCH_CODEL
+config BACKPORT_NET_SCH_CODEL
        tristate "codel"
        depends on m
        default m if NET_SCH_CODEL=n
 
-config COMPAT_NET_SCH_FQ_CODEL
+config BACKPORT_NET_SCH_FQ_CODEL
        tristate "FQ codel"
        depends on m
        default m if NET_SCH_FQ_CODEL=n
 
-config COMPAT_KFIFO
+config BACKPORT_KFIFO
        def_bool y
        # FIXME: REDHAT_6_1 also includes this
-       depends on COMPAT_KERNEL_2_6_36
+       depends on BACKPORT_KERNEL_2_6_36
 
-config COMPAT_CORDIC
+config BACKPORT_CORDIC
        bool
        default y if CORDIC=n
 
-config COMPAT_CRC8
+config BACKPORT_CRC8
        bool
        default y if !CRC8
 
-config COMPAT_ATOMIC64
+config BACKPORT_ATOMIC64
        bool
        default y if !64BIT && !GENERIC_ATOMIC64

diff --git a/compat/compat/Makefile b/compat/compat/Makefile
index 46e31d96ed95959ba784b8e092b1f90edb102ede..9f405647d47c25f6e664e43945d405708fd8c07f 100644 (file)
--- a/compat/compat/Makefile
+++ b/compat/compat/Makefile
@@ -2,45 +2,45 @@ ccflags-y += -I$(src)
 obj-m += compat.o
 compat-y += main.o
 
-obj-$(CPTCFG_COMPAT_FIRMWARE_CLASS) += compat_firmware_class.o
-obj-$(CPTCFG_COMPAT_NET_SCH_CODEL) += sch_codel.o
+obj-$(CPTCFG_BACKPORT_FIRMWARE_CLASS) += compat_firmware_class.o
+obj-$(CPTCFG_BACKPORT_NET_SCH_CODEL) += sch_codel.o
 
 sch_fq_codel-y = sch_fq_codel_core.o flow_dissector.o
-obj-$(CPTCFG_COMPAT_NET_SCH_FQ_CODEL) += sch_fq_codel.o
+obj-$(CPTCFG_BACKPORT_NET_SCH_FQ_CODEL) += sch_fq_codel.o
 
 # Compat kernel compatibility code
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_14) += compat-2.6.14.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_18) += compat-2.6.18.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_19) += compat-2.6.19.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_21) += compat-2.6.21.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_22) += compat-2.6.22.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_23) += compat-2.6.23.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_24) += compat-2.6.24.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_25) += compat-2.6.25.o pm_qos_params.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_26) += compat-2.6.26.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_27) += compat-2.6.27.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_28) += compat-2.6.28.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_29) += compat-2.6.29.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_32) += compat-2.6.32.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_33) += compat-2.6.33.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_34) += compat-2.6.34.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_35) += compat-2.6.35.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_36) += compat-2.6.36.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_37) += compat-2.6.37.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_38) += compat-2.6.38.o
-compat-$(CPTCFG_COMPAT_KERNEL_2_6_39) += compat-2.6.39.o kstrtox.o
-compat-$(CPTCFG_COMPAT_KERNEL_3_0) += compat-3.0.o
-compat-$(CPTCFG_COMPAT_KERNEL_3_1) += compat-3.1.o
-compat-$(CPTCFG_COMPAT_KERNEL_3_2) += compat-3.2.o
-compat-$(CPTCFG_COMPAT_KERNEL_3_3) += compat-3.3.o
-compat-$(CPTCFG_COMPAT_KERNEL_3_4) += compat-3.4.o
-compat-$(CPTCFG_COMPAT_KERNEL_3_5) += compat-3.5.o user_namespace.o
-compat-$(CPTCFG_COMPAT_KERNEL_3_6) += compat-3.6.o
-compat-$(CPTCFG_COMPAT_KERNEL_3_7) += compat-3.7.o
-compat-$(CPTCFG_COMPAT_KERNEL_3_8) += compat-3.8.o
-compat-$(CPTCFG_COMPAT_KERNEL_3_9) += compat-3.9.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_14) += compat-2.6.14.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_18) += compat-2.6.18.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_19) += compat-2.6.19.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_21) += compat-2.6.21.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_22) += compat-2.6.22.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_23) += compat-2.6.23.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_24) += compat-2.6.24.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_25) += compat-2.6.25.o pm_qos_params.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_26) += compat-2.6.26.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_27) += compat-2.6.27.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_28) += compat-2.6.28.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_29) += compat-2.6.29.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_32) += compat-2.6.32.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_33) += compat-2.6.33.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_34) += compat-2.6.34.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_35) += compat-2.6.35.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_36) += compat-2.6.36.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_37) += compat-2.6.37.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_38) += compat-2.6.38.o
+compat-$(CPTCFG_BACKPORT_KERNEL_2_6_39) += compat-2.6.39.o kstrtox.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_0) += compat-3.0.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_1) += compat-3.1.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_2) += compat-3.2.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_3) += compat-3.3.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_4) += compat-3.4.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_5) += compat-3.5.o user_namespace.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_6) += compat-3.6.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_7) += compat-3.7.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_8) += compat-3.8.o
+compat-$(CPTCFG_BACKPORT_KERNEL_3_9) += compat-3.9.o
 
-compat-$(CPTCFG_COMPAT_KFIFO) += kfifo.o
-compat-$(CPTCFG_COMPAT_CORDIC) += cordic.o
-compat-$(CPTCFG_COMPAT_CRC8) += crc8.o
-compat-$(CPTCFG_COMPAT_ATOMIC64) += compat_atomic.o
+compat-$(CPTCFG_BACKPORT_KFIFO) += kfifo.o
+compat-$(CPTCFG_BACKPORT_CORDIC) += cordic.o
+compat-$(CPTCFG_BACKPORT_CRC8) += crc8.o
+compat-$(CPTCFG_BACKPORT_ATOMIC64) += compat_atomic.o

diff --git a/plumbing/Makefile b/plumbing/Makefile
index 7fd35fcf2d5a8d06f9ef7b2e3550cbedc17fa01e..f0f0bc03d61433ae39a3ba2e4d82e0b0376818d0 100644 (file)
--- a/plumbing/Makefile
+++ b/plumbing/Makefile
@@ -46,7 +46,7 @@ help:
                print=0                                                                 ;\
                for v in $$kvers ; do                                                   \
                        if [ "$$print" = "1" ] ; then                                   \
-                               echo config COMPAT_KERNEL_$$(echo $$v | tr . _)         ;\
+                               echo config BACKPORT_KERNEL_$$(echo $$v | tr . _)       ;\
                                echo "    def_bool y"                                   ;\
                        fi                                                              ;\
                        if [ "$$v" = "$$kver" ] ; then print=1 ; fi                     ;\