From: Felix Fietkau Date: Mon, 18 Jun 2007 03:44:08 +0000 (+0000) Subject: update to 2.6.22-rc5 (#1915) X-Git-Tag: reboot~28908 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1c0f8d64f80b6f53ea5944b642d935b3a2ed1049;p=openwrt%2Fstaging%2Fblogic.git update to 2.6.22-rc5 (#1915) SVN-Revision: 7659 --- diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk index ee39b1c89eb1..35e8d59b760d 100644 --- a/package/kernel/modules/wireless.mk +++ b/package/kernel/modules/wireless.mk @@ -45,6 +45,18 @@ define KernelPackage/ieee80211-softmac endef $(eval $(call KernelPackage,ieee80211-softmac)) +define KernelPackage/mac80211 + TITLE:=mac80211 (Devicescape) support + DEPENDS:=@LINUX_2_6 + KCONFIG:=$(CONFIG_IEEE80211_SOFTMAC) + FILES:= \ + $(LINUX_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_simple) + SUBMENU:=$(WIMENU) + endef +$(eval $(call KernelPackage,mac80211)) define KernelPackage/net-bcm43xx TITLE:=Broadcom BCM43xx driver diff --git a/target/linux/x86-2.6/Makefile b/target/linux/x86-2.6/Makefile index 8eace73cdc77..db629fab5fc4 100644 --- a/target/linux/x86-2.6/Makefile +++ b/target/linux/x86-2.6/Makefile @@ -11,8 +11,8 @@ BOARD:=x86 BOARDNAME:=x86 FEATURES:=squashfs jffs2 ext2 -LINUX_VERSION:=2.6.22-rc4 -LINUX_KERNEL_MD5SUM:=125879208b47a4c27e4f31a33ab3011c +LINUX_VERSION:=2.6.22-rc5 +LINUX_KERNEL_MD5SUM:=50dda556ae492f68ff7c273e1f357c55 include $(INCLUDE_DIR)/kernel-build.mk DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci diff --git a/target/linux/x86-2.6/config/default b/target/linux/x86-2.6/config/default index 5e4030773bf0..a4730b330a86 100644 --- a/target/linux/x86-2.6/config/default +++ b/target/linux/x86-2.6/config/default @@ -20,6 +20,7 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ARCH_SPARSEMEM_ENABLE=y # CONFIG_ARLAN is not set +# CONFIG_ARCH_SUPPORTS_MSI is not set # CONFIG_AT1700 is not set CONFIG_ATA=m # CONFIG_ATA_GENERIC is not set @@ -73,6 +74,7 @@ CONFIG_CRYPTO_TWOFISH_586=m # CONFIG_DEBUG_BUGVERBOSE is not set # CONFIG_DELL_RBU is not set # CONFIG_DEPCA is not set +CONFIG_DEVPORT=y # CONFIG_DMASCC is not set CONFIG_DMI=y CONFIG_DOUBLEFAULT=y @@ -97,6 +99,7 @@ CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_IOMAP=y CONFIG_GENERIC_ISA_DMA=y # CONFIG_HANGCHECK_TIMER is not set +CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HID=y @@ -117,6 +120,7 @@ CONFIG_HW_RANDOM_GEODE=y CONFIG_HW_RANDOM_VIA=y CONFIG_I2C=m CONFIG_I2C_ALGOBIT=m +CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_ISA=m # CONFIG_I6300ESB_WDT is not set @@ -130,6 +134,7 @@ CONFIG_IDE=y # CONFIG_IDEDISK_MULTI_MODE is not set # CONFIG_IDEDMA_IVB is not set # CONFIG_IDEDMA_ONLYDISK is not set +CONFIG_IDEPCI_PCIBUS_ORDER=y CONFIG_IDEPCI_SHARE_IRQ=y # CONFIG_IDE_ARM is not set # CONFIG_IDE_CHIPSETS is not set @@ -146,6 +151,7 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 +# CONFIG_INPUT_POLLDEV is not set # CONFIG_IP_NF_SET_IPPORTHASH is not set CONFIG_ISA=y CONFIG_ISAPNP=y @@ -164,6 +170,7 @@ CONFIG_KTIME_SCALAR=y CONFIG_LEDS_NET48XX=m # CONFIG_LEDS_TRIGGER_IDE_DISK is not set # CONFIG_LEDS_WRAP is not set +# CONFIG_LIBERTAS is not set # CONFIG_M386 is not set CONFIG_M486=y # CONFIG_M586 is not set @@ -195,8 +202,8 @@ CONFIG_MOUSE_PS2=y # CONFIG_MOUSE_PS2_LIFEBOOK is not set # CONFIG_MOUSE_PS2_LOGIPS2PP is not set # CONFIG_MOUSE_PS2_SYNAPTICS is not set -# CONFIG_MOUSE_PS2_TRACKPOINT is not set # CONFIG_MOUSE_PS2_TOUCHKIT is not set +# CONFIG_MOUSE_PS2_TRACKPOINT is not set # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_VSXXXAA is not set # CONFIG_MPENTIUM4 is not set @@ -249,15 +256,16 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MWINCHIPC6 is not set CONFIG_NATSEMI=m CONFIG_NE2K_PCI=m +CONFIG_NETDEV_1000=y # CONFIG_NET_ISA is not set # CONFIG_NET_SB1000 is not set CONFIG_NET_SCH_FIFO=y CONFIG_NET_VENDOR_3COM=y # CONFIG_NET_VENDOR_RACAL is not set # CONFIG_NET_VENDOR_SMC is not set -CONFIG_NETDEV_1000=y CONFIG_NOHIGHMEM=y # CONFIG_NO_HZ is not set +CONFIG_NR_QUICK=1 CONFIG_NSC_GPIO=m CONFIG_NVRAM=y CONFIG_PAGE_OFFSET=0xC0000000 @@ -287,6 +295,7 @@ CONFIG_PNP=y # CONFIG_PNPACPI is not set # CONFIG_PNPBIOS is not set # CONFIG_PNP_DEBUG is not set +CONFIG_QUICKLIST=y # CONFIG_RELOCATABLE is not set CONFIG_RTC=y CONFIG_RWSEM_XCHGADD_ALGORITHM=y @@ -297,6 +306,7 @@ CONFIG_SATA_INTEL_COMBINED=y CONFIG_SC1200_WDT=m # CONFIG_SC520_WDT is not set # CONFIG_SCC is not set +CONFIG_SCSI_WAIT_SCAN=m CONFIG_SCx200=y CONFIG_SCx200HR_TIMER=y CONFIG_SCx200_ACB=m @@ -347,6 +357,7 @@ CONFIG_USB_OHCI_HCD=m # CONFIG_USB_STORAGE_ISD200 is not set CONFIG_USB_UHCI_HCD=m # CONFIG_VGACON_SOFT_SCROLLBACK is not set +# CONFIG_VGASTATE is not set CONFIG_VGA_CONSOLE=y CONFIG_VIA_RHINE=m # CONFIG_VIA_RHINE_MMIO is not set @@ -389,6 +400,7 @@ CONFIG_X86_INVLPG=y CONFIG_X86_L1_CACHE_SHIFT=4 # CONFIG_X86_LONGRUN is not set # CONFIG_X86_MCE is not set +CONFIG_X86_MINIMUM_CPU_MODEL=4 # CONFIG_X86_MSR is not set # CONFIG_X86_NUMAQ is not set # CONFIG_X86_P4_CLOCKMOD is not set @@ -408,3 +420,4 @@ CONFIG_X86_PPRO_FENCE=y # CONFIG_X86_VISWS is not set # CONFIG_X86_VOYAGER is not set CONFIG_X86_WP_WORKS_OK=y +CONFIG_X86_XADD=y