back out change to generic-2.6/files/ and update 310-ssb_pcicore_fixes.patch for...

[openwrt.git] / target / linux / x86 / Makefile

diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index ddb50e6..452065c 100644 (file)
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -11,7 +11,7 @@ BOARD:=x86
 BOARDNAME:=x86
 FEATURES:=squashfs jffs2 ext2
 
 BOARDNAME:=x86
 FEATURES:=squashfs jffs2 ext2
 

-LINUX_VERSION:=2.6.22.4
+LINUX_VERSION:=2.6.23

 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci


@@ -19,6 +19,6 @@ DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
 $(eval $(call Target,generic))
 $(eval $(call Target,mediacenter))
 $(eval $(call BuildTarget))
 $(eval $(call Target,generic))
 $(eval $(call Target,mediacenter))
 $(eval $(call BuildTarget))

-$(eval $(call RequireCommand,mkisofs, \
+$(eval $(call $(if $(CONFIG_TARGET_ROOTFS_ISO),RequireCommand,Ignore),mkisofs, \

        Please install mkisofs. \
 ))
        Please install mkisofs. \
 ))