diff options
author | Luis R. Rodriguez <mcgrof@suse.com> | 2014-11-04 18:14:29 -0800 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-11-14 13:47:17 -0800 |
commit | 1ce22a0938ac10c576431fc1d3150763f15aa4d8 (patch) | |
tree | bcbe6af244d21924149273bc672851daab7cc012 /backport/compat | |
parent | cb1b116353ad544dd8238edbe71efcca838b001a (diff) |
backports: remove extra BACKPORT_ prefix from kernel versioning
The CPTCFG_ prefix already implies backport, when integration
is used we'd end up with a double BACKPORT_ prefix, so just
remove the existing one as its not needed.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Diffstat (limited to 'backport/compat')
-rw-r--r-- | backport/compat/Kconfig | 10 | ||||
-rw-r--r-- | backport/compat/Makefile | 34 |
2 files changed, 22 insertions, 22 deletions
diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig index 06ef8d54..aadf2468 100644 --- a/backport/compat/Kconfig +++ b/backport/compat/Kconfig @@ -16,14 +16,14 @@ # # # not possible on kernel < X.Y, build will fail if any # # drivers are allowed to build on kernels < X.Y -# depends on BACKPORT_KERNEL_X_Y +# depends on KERNEL_X_Y # # # don't build the backport code if FOO is in the kernel # # already, but only if the kernel version is also >= X.Z; # # this is an example of backporting where the version of # # the FOO subsystem that we need is only available from # # kernel version X.Z -# depends on !FOO || BACKPORT_KERNEL_X_Z +# depends on !FOO || KERNEL_X_Z # # # build if driver needs it (it selects BPAUTO_FOO) # default m if BPAUTO_FOO @@ -43,7 +43,7 @@ # # config BPAUTO_BUILD_KFIFO # def_bool y -# depends on BACKPORT_KERNEL_2_6_36 +# depends on KERNEL_2_6_36 # # # C) similarly, a kconfig symbol for an option, e.g. @@ -83,9 +83,9 @@ config BPAUTO_BUILD_DMA_SHARED_HELPERS depends on HAS_DMA # Build on other kernels kernels < 3.9 if HAVE_GENERIC_DMA_COHERENT is # not set. Kernels >= 3.8 have this if HAS_DMA is set. - depends on (!HAVE_GENERIC_DMA_COHERENT || BACKPORT_KERNEL_3_9) + depends on (!HAVE_GENERIC_DMA_COHERENT || KERNEL_3_9) # Always build if on 3.3 - 3.5 - default y if (BACKPORT_KERNEL_3_4 || BACKPORT_KERNEL_3_5 || BACKPORT_KERNEL_3_6) + default y if (KERNEL_3_4 || KERNEL_3_5 || KERNEL_3_6) # build for testing default y if BPAUTO_USERSEL_BUILD_ALL diff --git a/backport/compat/Makefile b/backport/compat/Makefile index 0dd69fe4..e787763b 100644 --- a/backport/compat/Makefile +++ b/backport/compat/Makefile @@ -3,23 +3,23 @@ obj-m += compat.o compat-y += main.o # Kernel backport compatibility code -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) += backport-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_BACKPORT_KERNEL_3_10) += backport-3.10.o -compat-$(CPTCFG_BACKPORT_KERNEL_3_12) += backport-3.12.o -compat-$(CPTCFG_BACKPORT_KERNEL_3_13) += backport-3.13.o -compat-$(CPTCFG_BACKPORT_KERNEL_3_14) += backport-3.14.o -compat-$(CPTCFG_BACKPORT_KERNEL_3_15) += backport-3.15.o -compat-$(CPTCFG_BACKPORT_KERNEL_3_17) += backport-3.17.o -compat-$(CPTCFG_BACKPORT_KERNEL_3_18) += backport-3.18.o +compat-$(CPTCFG_KERNEL_3_0) += compat-3.0.o +compat-$(CPTCFG_KERNEL_3_1) += compat-3.1.o +compat-$(CPTCFG_KERNEL_3_2) += backport-3.2.o +compat-$(CPTCFG_KERNEL_3_3) += compat-3.3.o +compat-$(CPTCFG_KERNEL_3_4) += compat-3.4.o +compat-$(CPTCFG_KERNEL_3_5) += compat-3.5.o user_namespace.o +compat-$(CPTCFG_KERNEL_3_6) += compat-3.6.o +compat-$(CPTCFG_KERNEL_3_7) += compat-3.7.o +compat-$(CPTCFG_KERNEL_3_8) += compat-3.8.o +compat-$(CPTCFG_KERNEL_3_9) += compat-3.9.o +compat-$(CPTCFG_KERNEL_3_10) += backport-3.10.o +compat-$(CPTCFG_KERNEL_3_12) += backport-3.12.o +compat-$(CPTCFG_KERNEL_3_13) += backport-3.13.o +compat-$(CPTCFG_KERNEL_3_14) += backport-3.14.o +compat-$(CPTCFG_KERNEL_3_15) += backport-3.15.o +compat-$(CPTCFG_KERNEL_3_17) += backport-3.17.o +compat-$(CPTCFG_KERNEL_3_18) += backport-3.18.o compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o compat-$(CPTCFG_BPAUTO_BUILD_DMA_SHARED_HELPERS) += dma-shared-helpers.o |