fix compile errors with make 3.80

[openwrt.git] / include / kernel-build.mk

diff --git a/include/kernel-build.mk b/include/kernel-build.mk
index 1e63279..7a02d55 100644 (file)
--- a/include/kernel-build.mk
+++ b/include/kernel-build.mk
@@ -23,9 +23,6 @@ ifneq ($(DUMP),)
   .SILENT: $(TMP_CONFIG)
 endif
 
   .SILENT: $(TMP_CONFIG)
 endif
 

-ifneq ($(CONFIG_ATM),)
-  FEATURES += atm
-endif

 ifneq ($(CONFIG_PCI),)
   FEATURES += pci
 endif
 ifneq ($(CONFIG_PCI),)
   FEATURES += pci
 endif


@@ -35,9 +32,6 @@ endif
 ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
   FEATURES += pcmcia
 endif
 ifneq ($(CONFIG_PCMCIA)$(CONFIG_PCCARD),)
   FEATURES += pcmcia
 endif

-ifneq ($(CONFIG_VIDEO_DEV),)
-  FEATURES += video
-endif

 
 # remove duplicates
 FEATURES:=$(sort $(FEATURES))
 
 # remove duplicates
 FEATURES:=$(sort $(FEATURES))


@@ -98,7 +92,7 @@ define BuildKernel
        $(call Kernel/Prepare)
        touch $$@
 
        $(call Kernel/Prepare)
        touch $$@
 

-  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG)
+  $(STAMP_CONFIGURED): $(STAMP_PREPARED) $(LINUX_CONFIG) $(GENERIC_LINUX_CONFIG) $(TOPDIR)/.config

        $(call Kernel/Configure)
        touch $$@
 
        $(call Kernel/Configure)
        touch $$@
 


@@ -172,8 +166,8 @@ download: $(DL_DIR)/$(LINUX_SOURCE)
 prepare: $(STAMP_CONFIGURED)
 compile: $(LINUX_DIR)/.modules
 oldconfig menuconfig: $(STAMP_PREPARED) FORCE
 prepare: $(STAMP_CONFIGURED)
 compile: $(LINUX_DIR)/.modules
 oldconfig menuconfig: $(STAMP_PREPARED) FORCE

-       $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) > $(LINUX_DIR)/.config

        $(call Kernel/Configure)
        $(call Kernel/Configure)

+       $(SCRIPT_DIR)/config.pl '+' $(GENERIC_LINUX_CONFIG) $(LINUX_CONFIG) > $(LINUX_DIR)/.config

        $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $@
        $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)
 
        $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKEOPTS) $@
        $(SCRIPT_DIR)/config.pl '>' $(GENERIC_LINUX_CONFIG) $(LINUX_DIR)/.config > $(LINUX_CONFIG)