diff --git a/packages/linux/url b/packages/linux/url index fc33109a3e..2d04dbeab9 100644 --- a/packages/linux/url +++ b/packages/linux/url @@ -1 +1 @@ -http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.31-rc4.tar.bz2 +http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.31-rc5.tar.bz2 diff --git a/projects/intel/linux/linux.i386.conf b/projects/intel/linux/linux.i386.conf index 2f7647d05c..b61424405b 100644 --- a/projects/intel/linux/linux.i386.conf +++ b/projects/intel/linux/linux.i386.conf @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.31-rc4 +# Linux kernel version: 2.6.31-rc5 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -601,7 +601,6 @@ CONFIG_MAC80211_RC_MINSTREL=y # CONFIG_MAC80211_RC_DEFAULT_PID is not set CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_DEFAULT="minstrel" -CONFIG_MAC80211_MESH=y CONFIG_MAC80211_LEDS=y # CONFIG_MAC80211_DEBUG_MENU is not set # CONFIG_WIMAX is not set @@ -1085,6 +1084,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_POWER_SUPPLY_DEBUG is not set # CONFIG_PDA_POWER is not set # CONFIG_BATTERY_DS2760 is not set +# CONFIG_BATTERY_DS2782 is not set CONFIG_BATTERY_BQ27x00=m CONFIG_BATTERY_MAX17040=m CONFIG_HWMON=m @@ -1621,6 +1621,7 @@ CONFIG_USB_STORAGE_CYPRESS_ATACB=m # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set # CONFIG_USB_ISIGHTFW is not set # CONFIG_USB_VST is not set # CONFIG_USB_GADGET is not set