[packages/kernel] - partial update to 3.5.0
arekm
arekm at pld-linux.org
Sun Jul 22 19:48:28 CEST 2012
commit 42d62c0a594aae697867775358cf898d2cdb2ac5
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sun Jul 22 19:48:21 2012 +0200
- partial update to 3.5.0
kernel-imq.patch | 6 +-
kernel-multiarch.config | 450 +++++++++++++++++++++++++++++++++++-------------
kernel-x86.config | 4 +-
kernel-zph.patch | 2 +-
kernel.spec | 8 +-
5 files changed, 335 insertions(+), 135 deletions(-)
---
diff --git a/kernel-imq.patch b/kernel-imq.patch
index 4628690..32606e3 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1386,14 +1386,14 @@ diff -uNr linux-3.1/net/netfilter/Kconfig linux-3.1-imq/net/netfilter/Kconfig
diff -uNr linux-3.1/net/netfilter/Makefile linux-3.1-imq/net/netfilter/Makefile
--- linux-3.1/net/netfilter/Makefile 2011-10-24 10:10:05.000000000 +0300
+++ linux-3.1-imq/net/netfilter/Makefile 2011-11-04 11:12:52.123057315 +0200
-@@ -56,6 +56,7 @@
+@@ -61,6 +61,7 @@
obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_HL) += xt_HL.o
+obj-$(CONFIG_NETFILTER_XT_TARGET_IMQ) += xt_IMQ.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_HMARK) += xt_HMARK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
- obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
+ obj-$(CONFIG_NETFILTER_XT_TARGET_LOG) += xt_LOG.o
diff -uNr linux-3.1/net/netfilter/nf_internals.h linux-3.1-imq/net/netfilter/nf_internals.h
--- linux-3.1/net/netfilter/nf_internals.h 2011-10-24 10:10:05.000000000 +0300
+++ linux-3.1-imq/net/netfilter/nf_internals.h 2011-11-04 11:12:52.123057315 +0200
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 196d965..55a18ff 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -365,6 +365,7 @@ EXTRA_FIRMWARE all=""
DEBUG_DRIVER all=n
DEBUG_DEVRES all=n
#- file drivers/base/regmap/Kconfig goes here
+#- Default contiguous memory area size:
#-
#- *** FILE: drivers/bcma/Kconfig ***
@@ -522,7 +523,6 @@ MMTIMER ia64=m
TELCLOCK i386=m x86_64=m
DEVPORT all=y
#- file drivers/s390/char/Kconfig goes here
-RAMOOPS all=m
#-
#- *** FILE: drivers/char/agp/Kconfig ***
@@ -630,6 +630,7 @@ CRYPTO_DEV_HIFN_795X all=m
CRYPTO_DEV_HIFN_795X_RNG all=y
#- file drivers/crypto/caam/Kconfig goes here
CRYPTO_DEV_TALITOS all=m
+#- file drivers/crypto/ux500/Kconfig goes here
#-
#- *** FILE: drivers/devfreq/Kconfig ***
@@ -700,6 +701,13 @@ EISA_VIRTUAL_ROOT alpha=y i386=y
EISA_NAMES alpha=y i386=y
#-
+#- *** FILE: drivers/extcon/Kconfig ***
+#-
+EXTCON all=m
+#- Extcon Device Drivers
+EXTCON_GPIO all=m
+
+#-
#- *** FILE: drivers/firewire/Kconfig ***
#-
FIREWIRE all=n ia64=m ppc=m ppc64=m x86_64=m
@@ -742,6 +750,7 @@ GPIO_GENERIC_PLATFORM all=m
GPIO_IT8761E all=m
GPIO_XILINX powerpc=y
GPIO_SCH all=m
+GPIO_ICH all=m
GPIO_VX855 all=m
#- I2C GPIO expanders:
GPIO_MAX7300 all=m
@@ -794,6 +803,19 @@ DRM_SAVAGE all=m
#- file drivers/gpu/drm/vmwgfx/Kconfig goes here
#- file drivers/gpu/drm/gma500/Kconfig goes here
#- file drivers/gpu/drm/udl/Kconfig goes here
+#- file drivers/gpu/drm/ast/Kconfig goes here
+#- file drivers/gpu/drm/mgag200/Kconfig goes here
+#- file drivers/gpu/drm/cirrus/Kconfig goes here
+
+#-
+#- *** FILE: drivers/gpu/drm/ast/Kconfig ***
+#-
+DRM_AST all=m
+
+#-
+#- *** FILE: drivers/gpu/drm/cirrus/Kconfig ***
+#-
+DRM_CIRRUS_QEMU all=m
#-
#- *** FILE: drivers/gpu/drm/gma500/Kconfig ***
@@ -803,6 +825,11 @@ DRM_GMA600 all=y
DRM_GMA3600 all=y
#-
+#- *** FILE: drivers/gpu/drm/mgag200/Kconfig ***
+#-
+DRM_MGAG200 all=m
+
+#-
#- *** FILE: drivers/gpu/drm/nouveau/Kconfig ***
#-
DRM_NOUVEAU all=m
@@ -841,14 +868,14 @@ VGA_SWITCHEROO all=y
#-
#- *** FILE: drivers/hid/Kconfig ***
#-
-HID_SUPPORT all=y
HID all=m
HIDRAW all=y
-#- file drivers/hid/usbhid/Kconfig goes here
+HID_GENERIC all=m
HID_A4TECH all=m
HID_ACRUX all=m
HID_ACRUX_FF all=y
HID_APPLE all=m
+HID_AUREAL all=m
HID_BELKIN all=m
HID_CHERRY all=m
HID_CHICONY all=m
@@ -906,17 +933,16 @@ HID_TOPSEED all=m
HID_THRUSTMASTER all=m
THRUSTMASTER_FF all=y
HID_WACOM all=m
-HID_WACOM_POWER_SUPPLY all=y
HID_WIIMOTE all=m
HID_WIIMOTE_EXT all=y
HID_ZEROPLUS all=m
ZEROPLUS_FF all=y
HID_ZYDACRON all=m
+#- file drivers/hid/usbhid/Kconfig goes here
#-
#- *** FILE: drivers/hid/usbhid/Kconfig ***
#-
-#- USB Input Devices
USB_HID all=m
#- Input core support is needed for USB HID input layer or HIDBP support
HID_PID all=y
@@ -1037,6 +1063,7 @@ SENSORS_ADS1015 all=m
SENSORS_ADS7828 all=m
SENSORS_ADS7871 all=m
SENSORS_AMC6821 all=m
+SENSORS_INA2XX all=m
SENSORS_THMC50 all=m
SENSORS_TMP102 all=m
SENSORS_TMP401 all=m
@@ -1247,6 +1274,22 @@ I7300_IDLE x86_64=m
#-
IEEE802154_DRIVERS all=m
IEEE802154_FAKEHARD all=m
+IEEE802154_FAKELB all=m
+
+#-
+#- *** FILE: drivers/iio/Kconfig ***
+#-
+IIO all=m
+IIO_KFIFO_BUF all=m
+IIO_TRIGGER all=y
+IIO_CONSUMERS_PER_TRIGGER all=2
+#- file drivers/iio/adc/Kconfig goes here
+#- file drivers/iio/amplifiers/Kconfig goes here
+
+#-
+#- *** FILE: drivers/iio/amplifiers/Kconfig ***
+#-
+AD8366 all=m
#-
#- *** FILE: drivers/infiniband/Kconfig ***
@@ -1265,6 +1308,7 @@ INFINIBAND_ADDR_TRANS all=y sparc=
#- file drivers/infiniband/hw/cxgb4/Kconfig goes here
#- file drivers/infiniband/hw/mlx4/Kconfig goes here
#- file drivers/infiniband/hw/nes/Kconfig goes here
+#- file drivers/infiniband/hw/ocrdma/Kconfig goes here
#- file drivers/infiniband/ulp/ipoib/Kconfig goes here
#- file drivers/infiniband/ulp/srp/Kconfig goes here
#- file drivers/infiniband/ulp/srpt/Kconfig goes here
@@ -1309,6 +1353,11 @@ INFINIBAND_NES all=m sparc=
INFINIBAND_NES_DEBUG all=n
#-
+#- *** FILE: drivers/infiniband/hw/ocrdma/Kconfig ***
+#-
+INFINIBAND_OCRDMA all=m
+
+#-
#- *** FILE: drivers/infiniband/hw/qib/Kconfig ***
#-
INFINIBAND_QIB all=m
@@ -1343,6 +1392,7 @@ INPUT all=y
INPUT_FF_MEMLESS all=m
INPUT_POLLDEV all=m
INPUT_SPARSEKMAP all=m
+INPUT_MATRIXKMAP all=m
#- Userland interfaces
INPUT_MOUSEDEV all=y
INPUT_MOUSEDEV_PSAUX all=y
@@ -1426,6 +1476,7 @@ KEYBOARD_TCA6416 all=m
KEYBOARD_TCA8418 all=m
KEYBOARD_MATRIX all=m
KEYBOARD_LM8323 all=m
+KEYBOARD_LM8333 all=m
KEYBOARD_MAX7359 all=m
KEYBOARD_MCS all=m
KEYBOARD_MPR121 all=m
@@ -1547,6 +1598,7 @@ TOUCHSCREEN_CYTTSP_CORE all=m
TOUCHSCREEN_CYTTSP_I2C all=m
TOUCHSCREEN_CYTTSP_SPI all=m
TOUCHSCREEN_DA9034 all=m
+TOUCHSCREEN_DA9052 all=m
TOUCHSCREEN_DYNAPRO all=m
TOUCHSCREEN_HAMPSHIRE all=m
TOUCHSCREEN_EETI all=m
@@ -1556,6 +1608,7 @@ TOUCHSCREEN_ILI210X all=m
TOUCHSCREEN_GUNZE all=m
TOUCHSCREEN_ELO all=m
TOUCHSCREEN_WACOM_W8001 all=m
+TOUCHSCREEN_WACOM_I2C all=m
TOUCHSCREEN_MAX11801 all=m
TOUCHSCREEN_MCS5000 all=m
TOUCHSCREEN_MTOUCH all=m
@@ -1750,6 +1803,7 @@ NEW_LEDS all=y
LEDS_CLASS all=y
#- LED drivers
LEDS_LM3530 all=m
+LEDS_LM3533 all=m
LEDS_NET48XX i386=m
LEDS_WRAP i386=m
LEDS_SUNFIRE sparc64=m
@@ -1765,6 +1819,7 @@ LEDS_PCA9633 all=m
LEDS_WM831X_STATUS all=m
LEDS_WM8350 all=m
LEDS_DA903X all=m
+LEDS_DA9052 all=m
LEDS_DAC124S085 all=m
LEDS_REGULATOR all=m
LEDS_BD2802 all=m
@@ -1783,6 +1838,7 @@ LEDS_TRIGGER_BACKLIGHT all=m
LEDS_TRIGGER_GPIO all=m
LEDS_TRIGGER_DEFAULT_ON all=m
#- iptables trigger is under Netfilter config (LED target)
+LEDS_TRIGGER_TRANSIENT all=m
#-
#- *** FILE: drivers/lguest/Kconfig ***
@@ -1817,12 +1873,6 @@ SENSORS_AMS_PMU ppc=y
SENSORS_AMS_I2C ppc=y
#-
-#- *** FILE: drivers/mca/Kconfig ***
-#-
-MCA_LEGACY i386=y
-MCA_PROC_FS i386=y
-
-#-
#- *** FILE: drivers/md/Kconfig ***
#-
MD all=y
@@ -1985,6 +2035,7 @@ DVB_USB_TECHNISAT_USB2 all=m
DVB_USB_IT913X all=m
DVB_USB_MXL111SF all=m
DVB_USB_RTL28XXU all=m
+DVB_USB_AF9035 all=m
#-
#- *** FILE: drivers/media/dvb/firewire/Kconfig ***
@@ -2225,6 +2276,7 @@ VIDEO_OV7670 all=m
VIDEO_SR030PC30 all=m
VIDEO_NOON010PC30 all=m
#- file drivers/media/video/m5mols/Kconfig goes here
+#- file drivers/media/video/smiapp/Kconfig goes here
#- Flash devices
#- Video improvement chips
VIDEO_UPD64031A all=m
@@ -2232,6 +2284,7 @@ VIDEO_UPD64083 all=m
#- Miscelaneous helper chips
VIDEO_VIVI all=m
V4L_USB_DRIVERS all=y sparc=n
+#- file drivers/media/video/au0828/Kconfig goes here
#- file drivers/media/video/uvc/Kconfig goes here
#- file drivers/media/video/gspca/Kconfig goes here
#- file drivers/media/video/pvrusb2/Kconfig goes here
@@ -2241,7 +2294,6 @@ V4L_USB_DRIVERS all=y sparc=n
#- file drivers/media/video/cx231xx/Kconfig goes here
#- file drivers/media/video/tm6000/Kconfig goes here
#- file drivers/media/video/usbvision/Kconfig goes here
-#- file drivers/media/video/et61x251/Kconfig goes here
#- file drivers/media/video/sn9c102/Kconfig goes here
#- file drivers/media/video/pwc/Kconfig goes here
#- file drivers/media/video/cpia2/Kconfig goes here
@@ -2249,7 +2301,6 @@ USB_ZR364XX all=m
USB_STKWEBCAM all=m
USB_S2255 all=m
V4L_PCI_DRIVERS all=y
-#- file drivers/media/video/au0828/Kconfig goes here
#- file drivers/media/video/bt8xx/Kconfig goes here
#- file drivers/media/video/cx18/Kconfig goes here
#- file drivers/media/video/cx23885/Kconfig goes here
@@ -2292,6 +2343,7 @@ SOC_CAMERA_OV772X all=m
SOC_CAMERA_OV9640 all=m
SOC_CAMERA_OV9740 all=m
VIDEO_SH_MOBILE_CEU all=m
+#- file drivers/media/video/s5p-fimc/Kconfig goes here
#- file drivers/media/video/s5p-tv/Kconfig goes here
V4L_MEM2MEM_DRIVERS all=y
VIDEO_MEM2MEM_TESTDEV all=m
@@ -2361,11 +2413,6 @@ VIDEO_EM28XX_DVB all=m sparc=n
VIDEO_EM28XX_RC all=y
#-
-#- *** FILE: drivers/media/video/et61x251/Kconfig ***
-#-
-USB_ET61X251 all=m
-
-#-
#- *** FILE: drivers/media/video/gspca/Kconfig ***
#-
USB_GSPCA all=m
@@ -2521,6 +2568,11 @@ VIDEO_ZORAN_LML33R10 all=m
VIDEO_ZORAN_AVS6EYES all=m
#-
+#- *** FILE: drivers/memory/Kconfig ***
+#-
+MEMORY all=y
+
+#-
#- *** FILE: drivers/memstick/Kconfig ***
#-
MEMSTICK all=m
@@ -2576,6 +2628,7 @@ MFD_SM501 all=m
MFD_SM501_GPIO all=y
HTC_PASIC3 all=m
UCB1400_CORE all=m
+MFD_LM3533 all=m
TPS6105X all=m
TPS65010 all=m
TPS6507X all=m
@@ -2597,6 +2650,8 @@ PCF50633_ADC all=m
PCF50633_GPIO all=m
MFD_MC13783 all=m
MFD_MC13XXX all=m
+MFD_MC13XXX_SPI all=m
+MFD_MC13XXX_I2C all=m
ABX500_CORE all=y
AB3100_CORE all=y
AB3100_OTP all=m
@@ -2607,6 +2662,7 @@ AB8500_GPADC all=y
MFD_CS5535 all=m
MFD_TIMBERDALE all=m
LPC_SCH all=m
+LPC_ICH all=m
MFD_RDC321X all=m
MFD_JANZ_CMODIO all=m
MFD_VX855 all=m
@@ -2645,6 +2701,8 @@ DS1682 all=m
TI_DAC7512 all=m
VMWARE_BALLOON all=m
BMP085 all=m
+BMP085_I2C all=m
+BMP085_SPI all=m
PCH_PHUB all=m
USB_SWITCH_FSA9480 all=m
#- file drivers/misc/c2port/Kconfig goes here
@@ -2655,6 +2713,7 @@ USB_SWITCH_FSA9480 all=m
#- file drivers/misc/lis3lv02d/Kconfig goes here
#- file drivers/misc/carma/Kconfig goes here
#- file drivers/misc/altera-stapl/Kconfig goes here
+#- file drivers/misc/mei/Kconfig goes here
#-
#- *** FILE: drivers/misc/altera-stapl/Kconfig ***
@@ -2698,6 +2757,11 @@ SENSORS_LIS3_SPI all=m
SENSORS_LIS3_I2C all=m
#-
+#- *** FILE: drivers/misc/mei/Kconfig ***
+#-
+INTEL_MEI all=m
+
+#-
#- *** FILE: drivers/misc/ti-st/Kconfig ***
#-
TI_ST all=m
@@ -2916,7 +2980,6 @@ MTD_UBI all=m sparc=n
MTD_UBI_WL_THRESHOLD all=4096
MTD_UBI_BEB_RESERVE all=1
MTD_UBI_GLUEBI all=n powerpc=m
-MTD_UBI_DEBUG all=n
#-
#- *** FILE: drivers/net/Kconfig ***
@@ -2954,7 +3017,6 @@ NET_SB1000 all=m
#- file drivers/net/ppp/Kconfig goes here
#- file drivers/net/slip/Kconfig goes here
#- file drivers/s390/net/Kconfig goes here
-#- file drivers/net/tokenring/Kconfig goes here
#- file drivers/net/usb/Kconfig goes here
#- file drivers/net/wireless/Kconfig goes here
#- file drivers/net/wimax/Kconfig goes here
@@ -3094,11 +3156,9 @@ HPLAN_PLUS alpha=m i386=m
HPLAN alpha=m i386=m
LNE390 alpha=m i386=m
NE2000 alpha=m i386=m
-NE2_MCA i386=m
NE2K_PCI all=m
NE3210 alpha=m i386=m
PCMCIA_PCNET all=m
-ULTRAMCA i386=m
ULTRA alpha=m i386=m
ULTRA32 alpha=m i386=m
WD80x3 alpha=m i386=m
@@ -3172,6 +3232,7 @@ ETHOC all=m
#- file drivers/net/ethernet/toshiba/Kconfig goes here
#- file drivers/net/ethernet/tundra/Kconfig goes here
#- file drivers/net/ethernet/via/Kconfig goes here
+#- file drivers/net/ethernet/wiznet/Kconfig goes here
#- file drivers/net/ethernet/xilinx/Kconfig goes here
#- file drivers/net/ethernet/xircom/Kconfig goes here
@@ -3339,8 +3400,6 @@ HP100 all=m
NET_VENDOR_I825XX all=y
ELPLUS alpha=m i386=m
EL16 alpha=m i386=m
-ELMC i386=m
-ELMC_II i386=m
APRICOT alpha=m i386=m
EEXPRESS alpha=m i386=m
EEXPRESS_PRO alpha=m i386=m
@@ -3368,11 +3427,14 @@ E1000 all=m sparc=n
E1000E all=m
IGB all=m
IGB_DCA all=y
+IGB_PTP all=y
IGBVF all=m
IXGB all=m sparc=n
IXGBE all=m
+IXGBE_HWMON all=y
IXGBE_DCA all=y
IXGBE_DCB all=y
+IXGBE_PTP all=y
IXGBEVF all=m
#-
@@ -3390,6 +3452,7 @@ SKY2_DEBUG all=n
#- *** FILE: drivers/net/ethernet/mellanox/mlx4/Kconfig ***
#-
MLX4_EN all=m
+MLX4_EN_DCB all=y
MLX4_CORE all=m
#-
@@ -3419,7 +3482,6 @@ MYRI10GE_DCA all=y sparc=n
#- *** FILE: drivers/net/ethernet/natsemi/Kconfig ***
#-
NET_VENDOR_NATSEMI all=y
-IBMLANA i386=m
NATSEMI all=m
NS83820 all=m
@@ -3541,8 +3603,8 @@ NET_VENDOR_STMICRO all=y
#- *** FILE: drivers/net/ethernet/stmicro/stmmac/Kconfig ***
#-
STMMAC_ETH all=m
-STMMAC_PLATFORM all=m
-STMMAC_PCI all=m
+STMMAC_PLATFORM all=n
+STMMAC_PCI all=n
STMMAC_DEBUG_FS all=y
STMMAC_DA all=y
STMMAC_RING all=y
@@ -3588,6 +3650,16 @@ VIA_RHINE_MMIO all=y alpha=n
VIA_VELOCITY all=m
#-
+#- *** FILE: drivers/net/ethernet/wiznet/Kconfig ***
+#-
+NET_VENDOR_WIZNET all=y
+WIZNET_W5100 all=m
+WIZNET_W5300 all=m
+WIZNET_BUS_DIRECT all=n
+WIZNET_BUS_INDIRECT all=n
+WIZNET_BUS_ANY all=y
+
+#-
#- *** FILE: drivers/net/ethernet/xilinx/Kconfig ***
#-
XILINX_EMACLITE powerpc=m
@@ -3728,23 +3800,7 @@ SLIP_MODE_SLIP6 all=y
NET_TEAM all=m
NET_TEAM_MODE_ROUNDROBIN all=m
NET_TEAM_MODE_ACTIVEBACKUP all=m
-
-#-
-#- *** FILE: drivers/net/tokenring/Kconfig ***
-#-
-TR all=y sparc=n
-PCMCIA_IBMTR all=m ppc=n
-IBMTR alpha=m i386=m
-IBMOL all=m sparc=
-IBMLS i386=m ppc=n
-3C359 all=m sparc=
-TMS380TR all=m sparc=
-TMSPCI all=m sparc=
-SKISA alpha=m i386=m
-PROTEON alpha=m i386=m
-ABYSS all=m sparc=
-MADGEMC all=m
-SMCTR all=m
+NET_TEAM_MODE_LOADBALANCE all=m
#-
#- *** FILE: drivers/net/usb/Kconfig ***
@@ -3803,10 +3859,6 @@ HDLC_X25 all=m
#- X.25/LAPB support is disabled
PCI200SYN all=m
WANXL all=m
-PC300 all=m sparc=n
-PC300_MLPPP all=y
-#- Cyclades-PC300 MLPPP support is disabled.
-#- Refer to the file README.mlppp, provided by PC300 package.
PC300TOO all=m ia64=n ppc=n ppc64=n
N2 alpha=m i386=m
C101 alpha=m i386=m
@@ -3871,8 +3923,7 @@ MWL8K all=m
#- file drivers/net/wireless/p54/Kconfig goes here
#- file drivers/net/wireless/rt2x00/Kconfig goes here
#- file drivers/net/wireless/rtlwifi/Kconfig goes here
-#- file drivers/net/wireless/wl1251/Kconfig goes here
-#- file drivers/net/wireless/wl12xx/Kconfig goes here
+#- file drivers/net/wireless/ti/Kconfig goes here
#- file drivers/net/wireless/zd1211rw/Kconfig goes here
#- file drivers/net/wireless/mwifiex/Kconfig goes here
@@ -4014,6 +4065,7 @@ LIBERTAS_MESH all=y
MWIFIEX all=m
MWIFIEX_SDIO all=m
MWIFIEX_PCIE all=m
+MWIFIEX_USB all=m
#-
#- *** FILE: drivers/net/wireless/orinoco/Kconfig ***
@@ -4076,19 +4128,30 @@ RTLWIFI_DEBUG all=n
RTL8192C_COMMON all=m
#-
-#- *** FILE: drivers/net/wireless/wl1251/Kconfig ***
+#- *** FILE: drivers/net/wireless/ti/Kconfig ***
+#-
+WL_TI all=y
+#- file drivers/net/wireless/ti/wl1251/Kconfig goes here
+#- file drivers/net/wireless/ti/wl12xx/Kconfig goes here
+#- file drivers/net/wireless/ti/wlcore/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/wireless/ti/wl1251/Kconfig ***
#-
WL1251 all=m
WL1251_SPI all=m
WL1251_SDIO all=m
#-
-#- *** FILE: drivers/net/wireless/wl12xx/Kconfig ***
+#- *** FILE: drivers/net/wireless/ti/wl12xx/Kconfig ***
#-
-WL12XX_MENU all=m
WL12XX all=m
-WL12XX_SPI all=m
-WL12XX_SDIO all=m
+
+#-
+#- *** FILE: drivers/net/wireless/ti/wlcore/Kconfig ***
+#-
+WLCORE_SPI all=m
+WLCORE_SDIO all=m
#-
#- *** FILE: drivers/net/wireless/zd1211rw/Kconfig ***
@@ -4100,6 +4163,7 @@ ZD1211RW_DEBUG all=n
#- *** FILE: drivers/nfc/Kconfig ***
#-
PN544_NFC all=m
+PN544_HCI_NFC all=m
NFC_PN533 all=m
NFC_WILINK all=m
@@ -4351,6 +4415,7 @@ PTP_1588_CLOCK_PCH all=m
#- file drivers/rapidio/devices/Kconfig goes here
RAPIDIO_DISC_TIMEOUT all=30
RAPIDIO_ENABLE_RX_TX_PORTS all=y
+RAPIDIO_DMA_ENGINE all=y
RAPIDIO_DEBUG all=n
#- file drivers/rapidio/switches/Kconfig goes here
@@ -4567,15 +4632,11 @@ SCSI_EATA_TAGGED_QUEUE all=y
SCSI_EATA_LINKED_COMMANDS all=y
SCSI_EATA_MAX_TAGS all=16 i386=62 x86_64=62
SCSI_FUTURE_DOMAIN all=m
-SCSI_FD_MCS i386=m
SCSI_GDTH all=m
SCSI_ISCI all=m
SCSI_GENERIC_NCR5380 alpha=m i386=m
SCSI_GENERIC_NCR5380_MMIO alpha=m i386=m
SCSI_GENERIC_NCR53C400 alpha=y i386=y
-SCSI_IBMMCA i386=m
-IBMMCA_SCSI_ORDER_STANDARD i386=y
-IBMMCA_SCSI_DEV_RESET i386=n
SCSI_IPS all=m sparc=n sparc64=n
SCSI_IBMVSCSI ppc64=n
SCSI_IBMVSCSIS ppc64=n
@@ -4749,6 +4810,7 @@ PCMCIA_SYM53C500 all=m
#- *** FILE: drivers/scsi/qla2xxx/Kconfig ***
#-
SCSI_QLA_FC all=m sparc=n
+TCM_QLA2XXX all=m
#-
#- *** FILE: drivers/scsi/qla4xxx/Kconfig ***
@@ -4807,7 +4869,6 @@ SSB_DEBUG all=n
#- *** FILE: drivers/staging/Kconfig ***
#-
STAGING all=y
-#- file drivers/staging/serial/Kconfig goes here
#- file drivers/staging/et131x/Kconfig goes here
#- file drivers/staging/slicoss/Kconfig goes here
#- file drivers/staging/usbip/Kconfig goes here
@@ -4829,10 +4890,8 @@ STAGING all=y
#- file drivers/staging/line6/Kconfig goes here
#- file drivers/staging/octeon/Kconfig goes here
#- file drivers/staging/serqt_usb2/Kconfig goes here
-#- file drivers/staging/quatech_usb2/Kconfig goes here
#- file drivers/staging/vt6655/Kconfig goes here
#- file drivers/staging/vt6656/Kconfig goes here
-#- file drivers/staging/vme/Kconfig goes here
#- file drivers/staging/sep/Kconfig goes here
#- file drivers/staging/iio/Kconfig goes here
#- file drivers/staging/zram/Kconfig goes here
@@ -4853,20 +4912,22 @@ STAGING all=y
#- file drivers/staging/speakup/Kconfig goes here
#- file drivers/staging/cptm1217/Kconfig goes here
#- file drivers/staging/ste_rmi4/Kconfig goes here
-#- file drivers/staging/mei/Kconfig goes here
#- file drivers/staging/nvec/Kconfig goes here
#- file drivers/staging/media/Kconfig goes here
+#- file drivers/staging/net/Kconfig goes here
#- file drivers/staging/omapdrm/Kconfig goes here
#- file drivers/staging/android/Kconfig goes here
#- file drivers/staging/telephony/Kconfig goes here
#- file drivers/staging/ramster/Kconfig goes here
#- file drivers/staging/ozwpan/Kconfig goes here
+#- file drivers/staging/ccg/Kconfig goes here
+#- file drivers/staging/ipack/Kconfig goes here
+#- file drivers/staging/gdm72xx/Kconfig goes here
#-
#- *** FILE: drivers/staging/android/Kconfig ***
#-
ANDROID all=n
-#- file drivers/staging/android/switch/Kconfig goes here
#-
#- *** FILE: drivers/staging/asus_oled/Kconfig ***
@@ -4883,6 +4944,8 @@ BCM_WIMAX all=m
#-
COMEDI all=m ppc=n
COMEDI_DEBUG all=n
+COMEDI_DEFAULT_BUF_SIZE_KB all=2048
+COMEDI_DEFAULT_BUF_MAXSIZE_KB all=20480
COMEDI_MISC_DRIVERS all=m
COMEDI_KCOMEDILIB all=m
COMEDI_BOND all=m
@@ -4956,12 +5019,12 @@ COMEDI_ADL_PCI9118 all=m
COMEDI_ADV_PCI1710 all=m
COMEDI_ADV_PCI1723 all=m
COMEDI_ADV_PCI_DIO all=m
-COMEDI_AMPLC_DIO200 all=m
-COMEDI_AMPLC_PC236 all=m
-COMEDI_AMPLC_PC263 all=m
+COMEDI_AMPLC_DIO200_PCI all=m
+COMEDI_AMPLC_PC236_PCI all=m
COMEDI_AMPLC_PCI224 all=m
COMEDI_AMPLC_PCI230 all=m
COMEDI_CONTEC_PCI_DIO all=m
+COMEDI_DAS08_PCI all=m
COMEDI_DT3000 all=m
COMEDI_DYNA_PCI10XX all=m
COMEDI_UNIOXX5 all=m
@@ -5007,6 +5070,9 @@ COMEDI_NI_COMMON all=m
COMEDI_MITE all=m
COMEDI_NI_TIO all=m
COMEDI_NI_LABPC all=m
+COMEDI_AMPLC_DIO200 all=m
+COMEDI_AMPLC_PC236 all=m
+COMEDI_AMPLC_PC263 all=m
#-
#- *** FILE: drivers/staging/cptm1217/Kconfig ***
@@ -5047,20 +5113,27 @@ FT1000_USB all=m
FT1000_PCMCIA all=m
#-
+#- *** FILE: drivers/staging/gdm72xx/Kconfig ***
+#-
+WIMAX_GDM72XX all=m
+WIMAX_GDM72XX_QOS all=y
+WIMAX_GDM72XX_K_MODE all=y
+WIMAX_GDM72XX_WIMAX2 all=y
+WIMAX_GDM72XX_USB all=y
+WIMAX_GDM72XX_SDIO all=n
+WIMAX_GDM72XX_USB_PM all=y
+
+#-
#- *** FILE: drivers/staging/iio/Kconfig ***
#-
-IIO all=m
IIO_ST_HWMON all=m
IIO_SW_RING all=m
-IIO_KFIFO_BUF all=m
-IIO_TRIGGER all=y
-IIO_CONSUMERS_PER_TRIGGER all=2
#- file drivers/staging/iio/accel/Kconfig goes here
#- file drivers/staging/iio/adc/Kconfig goes here
#- file drivers/staging/iio/addac/Kconfig goes here
#- file drivers/staging/iio/cdc/Kconfig goes here
#- file drivers/staging/iio/dac/Kconfig goes here
-#- file drivers/staging/iio/dds/Kconfig goes here
+#- file drivers/staging/iio/frequency/Kconfig goes here
#- file drivers/staging/iio/gyro/Kconfig goes here
#- file drivers/staging/iio/impedance-analyzer/Kconfig goes here
#- file drivers/staging/iio/imu/Kconfig goes here
@@ -5139,7 +5212,7 @@ AD5686 all=m
MAX517 all=m
#-
-#- *** FILE: drivers/staging/iio/dds/Kconfig ***
+#- *** FILE: drivers/staging/iio/frequency/Kconfig ***
#-
AD5930 all=m
AD9832 all=m
@@ -5172,8 +5245,10 @@ ADIS16400 all=m
#- *** FILE: drivers/staging/iio/light/Kconfig ***
#-
SENSORS_ISL29018 all=m
+SENSORS_ISL29028 all=m
SENSORS_TSL2563 all=m
TSL2583 all=m
+TSL2x7x all=m
#-
#- *** FILE: drivers/staging/iio/magnetometer/Kconfig ***
@@ -5208,6 +5283,23 @@ IIO_GPIO_TRIGGER all=m
IIO_SYSFS_TRIGGER all=m
#-
+#- *** FILE: drivers/staging/ipack/Kconfig ***
+#-
+IPACK_BUS all=m
+#- file drivers/staging/ipack/bridges/Kconfig goes here
+#- file drivers/staging/ipack/devices/Kconfig goes here
+
+#-
+#- *** FILE: drivers/staging/ipack/bridges/Kconfig ***
+#-
+BOARD_TPCI200 all=m
+
+#-
+#- *** FILE: drivers/staging/ipack/devices/Kconfig ***
+#-
+SERIAL_IPOCTAL all=m
+
+#-
#- *** FILE: drivers/staging/keucr/Kconfig ***
#-
USB_ENESTORAGE all=m
@@ -5293,9 +5385,12 @@ LIRC_ZILOG all=m
SOLO6X10 all=m
#-
-#- *** FILE: drivers/staging/mei/Kconfig ***
+#- *** FILE: drivers/staging/net/Kconfig ***
#-
-INTEL_MEI all=m
+PC300 all=m sparc=n
+PC300_MLPPP all=y
+#- Cyclades-PC300 MLPPP support is disabled.
+#- Refer to the file README.mlppp, provided by PC300 package.
#-
#- *** FILE: drivers/staging/ozwpan/Kconfig ***
@@ -5316,11 +5411,6 @@ PANEL_CHANGE_MESSAGE all=n
IDE_PHISON all=m
#-
-#- *** FILE: drivers/staging/quatech_usb2/Kconfig ***
-#-
-USB_SERIAL_QUATECH_USB2 all=m
-
-#-
#- *** FILE: drivers/staging/quickstart/Kconfig ***
#-
ACPI_QUICKSTART all=m
@@ -5432,27 +5522,6 @@ USBIP_HOST all=m
USBIP_DEBUG all=n
#-
-#- *** FILE: drivers/staging/vme/Kconfig ***
-#-
-VME_BUS all=m
-#- file drivers/staging/vme/bridges/Kconfig goes here
-#- file drivers/staging/vme/devices/Kconfig goes here
-#- file drivers/staging/vme/boards/Kconfig goes here
-
-#-
-#- *** FILE: drivers/staging/vme/boards/Kconfig ***
-#-
-#- VME Board Drivers
-VMIVME_7805 all=m
-
-#-
-#- *** FILE: drivers/staging/vme/bridges/Kconfig ***
-#-
-#- VME Bridge Drivers
-VME_CA91CX42 all=m
-VME_TSI148 all=m
-
-#-
#- *** FILE: drivers/staging/vme/devices/Kconfig ***
#-
#- VME Device Drivers
@@ -5515,6 +5584,7 @@ TCM_PSCSI all=m
#- file drivers/target/loopback/Kconfig goes here
#- file drivers/target/tcm_fc/Kconfig goes here
#- file drivers/target/iscsi/Kconfig goes here
+#- file drivers/target/sbp/Kconfig goes here
#-
#- *** FILE: drivers/target/iscsi/Kconfig ***
@@ -5527,6 +5597,11 @@ ISCSI_TARGET all=m
LOOPBACK_TARGET all=m
#-
+#- *** FILE: drivers/target/sbp/Kconfig ***
+#-
+SBP_TARGET all=m
+
+#-
#- *** FILE: drivers/target/tcm_fc/Kconfig ***
#-
TCM_FC all=m
@@ -5596,7 +5671,6 @@ SERIAL_8250_HUB6 alpha=m i386=m
SERIAL_8250_SHARE_IRQ all=y
SERIAL_8250_DETECT_IRQ all=y
SERIAL_8250_RSA all=y
-SERIAL_8250_MCA i386=m
#-
#- *** FILE: drivers/tty/serial/Kconfig ***
@@ -5667,6 +5741,7 @@ USB all=m sparc=n
#- file drivers/usb/wusbcore/Kconfig goes here
#- file drivers/usb/host/Kconfig goes here
#- file drivers/usb/musb/Kconfig goes here
+#- file drivers/usb/chipidea/Kconfig goes here
#- file drivers/usb/renesas_usbhs/Kconfig goes here
#- file drivers/usb/class/Kconfig goes here
#- file drivers/usb/storage/Kconfig goes here
@@ -5675,6 +5750,7 @@ USB all=m sparc=n
USB_USS720 all=m
#- file drivers/usb/serial/Kconfig goes here
#- file drivers/usb/misc/Kconfig goes here
+#- file drivers/usb/phy/Kconfig goes here
#- file drivers/usb/atm/Kconfig goes here
#- file drivers/usb/gadget/Kconfig goes here
#- file drivers/usb/otg/Kconfig goes here
@@ -5689,6 +5765,14 @@ USB_UEAGLEATM all=m
USB_XUSBATM all=m
#-
+#- *** FILE: drivers/usb/chipidea/Kconfig ***
+#-
+USB_CHIPIDEA all=m
+USB_CHIPIDEA_UDC all=y
+USB_CHIPIDEA_HOST all=y
+USB_CHIPIDEA_DEBUG all=n
+
+#-
#- *** FILE: drivers/usb/class/Kconfig ***
#-
#- USB Device Class drivers
@@ -5703,8 +5787,6 @@ USB_TMC all=m
USB_DEBUG all=n
USB_ANNOUNCE_NEW_DEVICES all=y
#- Miscellaneous USB options
-USB_DEVICEFS all=y
-USB_DEVICE_CLASS all=n
USB_DYNAMIC_MINORS all=y sparc64=n
USB_SUSPEND all=y
USB_OTG all=n
@@ -5732,7 +5814,6 @@ USB_MV_UDC all=m
USB_GADGET_MUSB_HDRC all=n
USB_M66592 all=m
USB_AMD5536UDC all=m
-USB_CI13XXX_PCI all=m
USB_NET2272 all=m
USB_NET2272_DMA all=y
USB_NET2280 all=m
@@ -5756,6 +5837,7 @@ USB_FUNCTIONFS_GENERIC all=y
USB_FILE_STORAGE all=m
USB_FILE_STORAGE_TEST all=n
USB_MASS_STORAGE all=m
+USB_GADGET_TARGET all=m
USB_G_SERIAL all=m
USB_MIDI_GADGET all=m
USB_G_PRINTER all=m
@@ -5870,6 +5952,12 @@ AB8500_USB all=m
USB_MV_OTG all=m
#-
+#- *** FILE: drivers/usb/phy/Kconfig ***
+#-
+#- USB Physical Layer drivers
+USB_ISP1301 all=m
+
+#-
#- *** FILE: drivers/usb/renesas_usbhs/Kconfig ***
#-
USB_RENESAS_USBHS all=m
@@ -5943,6 +6031,7 @@ USB_SERIAL_OPTICON all=m
USB_SERIAL_VIVOPAY_SERIAL all=m
USB_SERIAL_ZIO all=m
USB_SERIAL_SSU100 all=m
+USB_SERIAL_QT2 all=m
USB_SERIAL_DEBUG all=m
#-
@@ -6119,6 +6208,9 @@ FB_MB862XX all=m
FB_MB862XX_PCI_GDC all=y
FB_MB862XX_I2C all=y
FB_BROADSHEET all=m
+FB_AUO_K190X all=m
+FB_AUO_K1900 all=m
+FB_AUO_K1901 all=m
#- file drivers/video/omap/Kconfig goes here
#- file drivers/video/omap2/Kconfig goes here
#- file drivers/video/exynos/Kconfig goes here
@@ -6142,6 +6234,7 @@ LCD_LD9040 all=m
LCD_AMS369FG06 all=m
BACKLIGHT_CLASS_DEVICE all=y
BACKLIGHT_GENERIC all=m
+BACKLIGHT_LM3533 all=m
BACKLIGHT_PROGEAR i386=m x86_64=m
BACKLIGHT_CARILLO_RANCH i386=m x86_64=m
BACKLIGHT_DA903X all=m
@@ -6214,6 +6307,28 @@ VIRTIO_RING all=m
VIRTIO_PCI all=m
VIRTIO_BALLOON all=m
VIRTIO_MMIO all=m
+VIRTIO_MMIO_CMDLINE_DEVICES all=y
+
+#-
+#- *** FILE: drivers/vme/Kconfig ***
+#-
+VME_BUS all=m
+#- file drivers/vme/bridges/Kconfig goes here
+#- file drivers/vme/boards/Kconfig goes here
+#- file drivers/staging/vme/devices/Kconfig goes here
+
+#-
+#- *** FILE: drivers/vme/boards/Kconfig ***
+#-
+#- VME Board Drivers
+VMIVME_7805 all=m
+
+#-
+#- *** FILE: drivers/vme/bridges/Kconfig ***
+#-
+#- VME Bridge Drivers
+VME_CA91CX42 all=m
+VME_TSI148 all=m
#-
#- *** FILE: drivers/w1/Kconfig ***
@@ -6255,6 +6370,7 @@ WATCHDOG_CORE all=y
WATCHDOG_NOWAYOUT all=n
#- Watchdog Device Drivers
SOFT_WATCHDOG all=m
+DA9052_WATCHDOG all=m
WM831X_WATCHDOG all=m
WM8350_WATCHDOG all=m
TWL4030_WATCHDOG powerpc=m
@@ -6272,6 +6388,7 @@ IB700_WDT i386=m x86_64=m
IBMASR i386=m x86_64=m
WAFER_WDT i386=m x86_64=m
I6300ESB_WDT i386=m x86_64=m
+IE6XX_WDT all=m
ITCO_WDT all=m
ITCO_VENDOR_SUPPORT all=y
IT8712F_WDT all=m
@@ -6690,6 +6807,7 @@ NCPFS_EXTRAS all=y
#- *** FILE: fs/nfs/Kconfig ***
#-
NFS_FS all=m
+NFS_V2 all=y
NFS_V3 all=y
NFS_V3_ACL all=y
NFS_V4 all=y
@@ -6754,6 +6872,17 @@ NLS_ISO8859_14 all=m
NLS_ISO8859_15 all=m
NLS_KOI8_R all=m
NLS_KOI8_U all=m
+NLS_MAC_ROMAN all=m
+NLS_MAC_CELTIC all=m
+NLS_MAC_CENTEURO all=m
+NLS_MAC_CROATIAN all=m
+NLS_MAC_CYRILLIC all=m
+NLS_MAC_GAELIC all=m
+NLS_MAC_GREEK all=m
+NLS_MAC_ICELAND all=m
+NLS_MAC_INUIT all=m
+NLS_MAC_ROMANIAN all=m
+NLS_MAC_TURKISH all=m
NLS_UTF8 all=m
#-
@@ -6805,6 +6934,7 @@ PROC_SYSCTL all=y
#- *** FILE: fs/pstore/Kconfig ***
#-
PSTORE all=y
+PSTORE_RAM all=m
#-
#- *** FILE: fs/qnx4/Kconfig ***
@@ -6869,11 +6999,9 @@ SYSV_FS all=m
#- *** FILE: fs/ubifs/Kconfig ***
#-
UBIFS_FS all=m
-UBIFS_FS_XATTR all=y
UBIFS_FS_ADVANCED_COMPR all=y
UBIFS_FS_LZO all=y
UBIFS_FS_ZLIB all=y
-UBIFS_FS_DEBUG all=n
#-
#- *** FILE: fs/udf/Kconfig ***
@@ -6930,8 +7058,10 @@ AUDIT all=y
AUDITSYSCALL all=y
AUDIT_LOGINUID_IMMUTABLE all=n
#- file kernel/irq/Kconfig goes here
+#- file kernel/time/Kconfig goes here
TREE_RCU all=y
RCU_FANOUT all=32 alpha=64 ia64=64 ppc64=64 sparc64=64 x86_64=64
+RCU_FANOUT_LEAF all=16
RCU_FANOUT_EXACT all=n
RCU_FAST_NO_HZ all=y
IKCONFIG all=m
@@ -6991,7 +7121,6 @@ SHMEM all=y
AIO all=y
EMBEDDED all=n
PERF_EVENTS all=y
-PERF_COUNTERS all=y
DEBUG_PERF_USE_VMALLOC all=n
VM_EVENT_COUNTERS all=y
PCI_QUIRKS all=y
@@ -7039,6 +7168,7 @@ GCOV_KERNEL all=n
#- *** FILE: kernel/irq/Kconfig ***
#-
GENERIC_IRQ_SHOW all=y
+IRQ_DOMAIN_DEBUG all=n
IRQ_FORCED_THREADING all=y
#-
@@ -7051,6 +7181,10 @@ HIBERNATION all=y
PM_STD_PARTITION all=""
PM_SLEEP all=y
PM_SLEEP_SMP all=y
+PM_AUTOSLEEP all=y
+PM_WAKELOCKS all=y
+PM_WAKELOCKS_LIMIT all=100
+PM_WAKELOCKS_GC all=y
PM_RUNTIME all=y
PM all=y
PM_DEBUG all=n
@@ -7081,6 +7215,7 @@ PROFILE_ALL_BRANCHES all=n
STACK_TRACER all=n
BLK_DEV_IO_TRACE all=n
KPROBE_EVENT all=y
+UPROBE_EVENT all=y
FTRACE_STARTUP_TEST all=n
MMIOTRACE x86=n
RING_BUFFER_BENCHMARK all=m
@@ -7122,6 +7257,7 @@ HAS_DMA all=y
CHECK_SIGNATURE all=y
CPU_RMAP all=y
CORDIC all=m
+DDR all=y
#-
#- *** FILE: lib/Kconfig.debug ***
@@ -7133,6 +7269,7 @@ ENABLE_MUST_CHECK all=y
FRAME_WARN all=2048
MAGIC_SYSRQ all=y
STRIP_ASM_SYMS all=y
+READABLE_ASM all=n
UNUSED_SYMBOLS all=y
#* required by oprofile
DEBUG_FS all=y
@@ -7256,7 +7393,9 @@ HWPOISON_INJECT all=m
TRANSPARENT_HUGEPAGE all=y
TRANSPARENT_HUGEPAGE_ALWAYS all=y
TRANSPARENT_HUGEPAGE_MADVISE all=n
+CROSS_MEMORY_ATTACH all=y
CLEANCACHE all=y
+FRONTSWAP all=y
#-
#- *** FILE: mm/Kconfig.debug ***
@@ -7317,10 +7456,10 @@ BRIDGE_NETFILTER all=y
#- file drivers/net/appletalk/Kconfig goes here
#- file net/x25/Kconfig goes here
#- file net/lapb/Kconfig goes here
-#- file net/econet/Kconfig goes here
#- file net/wanrouter/Kconfig goes here
#- file net/phonet/Kconfig goes here
#- file net/ieee802154/Kconfig goes here
+#- file net/mac802154/Kconfig goes here
#- file net/sched/Kconfig goes here
#- file net/dcb/Kconfig goes here
#- file net/dns_resolver/Kconfig goes here
@@ -7328,7 +7467,6 @@ BRIDGE_NETFILTER all=y
#- file net/openvswitch/Kconfig goes here
RFS_ACCEL all=y
NETPRIO_CGROUP all=m
-HAVE_BPF_JIT all=y
BPF_JIT all=y
NET_PKTGEN all=m
NET_TCPPROBE all=m
@@ -7348,6 +7486,7 @@ WIRELESS all=y
#- file net/caif/Kconfig goes here
#- file net/ceph/Kconfig goes here
#- file net/nfc/Kconfig goes here
+HAVE_BPF_JIT all=y
#-
#- *** FILE: net/atm/Kconfig ***
@@ -7375,6 +7514,7 @@ ROSE all=m
#- *** FILE: net/batman-adv/Kconfig ***
#-
BATMAN_ADV all=m
+BATMAN_ADV_BLA all=y
BATMAN_ADV_DEBUG all=n
#-
@@ -7505,13 +7645,6 @@ DECNET_NF_GRABULATOR all=m
NET_DSA all=y
#-
-#- *** FILE: net/econet/Kconfig ***
-#-
-ECONET all=m
-ECONET_AUNUDP all=y
-ECONET_NATIVE all=y
-
-#-
#- *** FILE: net/ieee802154/Kconfig ***
#-
IEEE802154 all=m
@@ -7635,7 +7768,6 @@ IPV6_PIMSM_V2 all=y
#- *** FILE: net/ipv6/netfilter/Kconfig ***
#-
NF_CONNTRACK_IPV6 all=m
-IP6_NF_QUEUE all=m
IP6_NF_IPTABLES all=m
IP6_NF_MATCH_AH all=m
IP6_NF_MATCH_EUI64 all=m
@@ -7727,6 +7859,11 @@ MAC80211_DEBUGFS all=n
MAC80211_DEBUG_MENU all=n
#-
+#- *** FILE: net/mac802154/Kconfig ***
+#-
+MAC802154 all=m
+
+#-
#- *** FILE: net/netfilter/Kconfig ***
#-
NETFILTER_NETLINK_ACCT all=m
@@ -7770,6 +7907,7 @@ NETFILTER_XT_TARGET_CONNMARK all=m
NETFILTER_XT_TARGET_CONNSECMARK all=m
NETFILTER_XT_TARGET_CT all=m
NETFILTER_XT_TARGET_DSCP all=m
+NETFILTER_XT_TARGET_HMARK all=m
NETFILTER_XT_TARGET_IDLETIMER all=m
NETFILTER_XT_TARGET_LED all=m
NETFILTER_XT_TARGET_LOG all=m
@@ -7885,10 +8023,17 @@ NETLABEL all=y
#-
NFC all=m
#- file net/nfc/nci/Kconfig goes here
+#- file net/nfc/hci/Kconfig goes here
#- file net/nfc/llcp/Kconfig goes here
#- file drivers/nfc/Kconfig goes here
#-
+#- *** FILE: net/nfc/hci/Kconfig ***
+#-
+NFC_HCI all=m
+NFC_SHDLC all=y
+
+#-
#- *** FILE: net/nfc/llcp/Kconfig ***
#-
NFC_LLCP all=y
@@ -7958,6 +8103,8 @@ NET_SCH_DRR all=m
NET_SCH_MQPRIO all=m
NET_SCH_CHOKE all=m
NET_SCH_QFQ all=m
+NET_SCH_CODEL all=m
+NET_SCH_FQ_CODEL all=m
NET_SCH_INGRESS all=m
NET_SCH_PLUG all=m
#- Classification
@@ -8078,10 +8225,7 @@ SAMPLES all=n
#-
#- *** FILE: security/Kconfig ***
#-
-KEYS all=y
-TRUSTED_KEYS all=m
-ENCRYPTED_KEYS all=m
-KEYS_DEBUG_PROC_KEYS all=n
+#- file security/keys/Kconfig goes here
SECURITY_DMESG_RESTRICT all=y
SECURITY all=y
SECURITY_NETWORK all=y
@@ -8115,6 +8259,14 @@ SECURITY_APPARMOR_BOOTPARAM_VALUE=1
IMA all=n
#-
+#- *** FILE: security/keys/Kconfig ***
+#-
+KEYS all=y
+TRUSTED_KEYS all=m
+ENCRYPTED_KEYS all=m
+KEYS_DEBUG_PROC_KEYS all=n
+
+#-
#- *** FILE: security/selinux/Kconfig ***
#-
SECURITY_SELINUX all=y
@@ -8416,7 +8568,6 @@ SND_HDA_INPUT_BEEP_MODE all=2
SND_HDA_INPUT_JACK all=y
SND_HDA_PATCH_LOADER all=y
SND_HDA_CODEC_REALTEK all=y
-SND_HDA_ENABLE_REALTEK_QUIRKS all=y
SND_HDA_CODEC_ANALOG all=y
SND_HDA_CODEC_SIGMATEL all=y
SND_HDA_CODEC_VIA all=y
@@ -8457,7 +8608,6 @@ SND_SOC all=m
#- file sound/soc/davinci/Kconfig goes here
#- file sound/soc/ep93xx/Kconfig goes here
#- file sound/soc/fsl/Kconfig goes here
-#- file sound/soc/imx/Kconfig goes here
#- file sound/soc/jz4740/Kconfig goes here
#- file sound/soc/nuc900/Kconfig goes here
#- file sound/soc/omap/Kconfig goes here
@@ -8470,7 +8620,9 @@ SND_SOC all=m
#- file sound/soc/sh/Kconfig goes here
#- file sound/soc/tegra/Kconfig goes here
#- file sound/soc/txx9/Kconfig goes here
+#- file sound/soc/ux500/Kconfig goes here
#- file sound/soc/codecs/Kconfig goes here
+#- file sound/soc/generic/Kconfig goes here
#-
#- *** FILE: sound/soc/codecs/Kconfig ***
@@ -8495,6 +8647,11 @@ SND_MPC52xx_SOC_PCM030 powerpc=m
SND_MPC52xx_SOC_EFIKA powerpc=m
#-
+#- *** FILE: sound/soc/generic/Kconfig ***
+#-
+SND_SIMPLE_CARD all=m
+
+#-
#- *** FILE: sound/sparc/Kconfig ***
#-
SND_SPARC sparc=y sparc64=y
@@ -8536,6 +8693,8 @@ INITRAMFS_COMPRESSION_LZMA all=n
#-
#- *** PROBABLY REMOVED OPTIONS ***
#-
+3C359 all=m sparc=
+ABYSS all=m sparc=
ACPI_ASUS i386=m x86_64=m
AD2S120X all=m
AD2S1210_GPIO_INPUT all=n
@@ -8562,6 +8721,11 @@ DRM_PSB_MRST all=y
EARLY_PRINTK_MRST all=n
EASYCAP_OSS all=n
EASYCAP_SND all=y
+ECONET all=m
+ECONET_AUNUDP all=y
+ECONET_NATIVE all=y
+ELMC i386=m
+ELMC_II i386=m
ET131X_DEBUG all=n
GPIO_BASIC_MMIO all=m
GPIO_BASIC_MMIO_CORE all=m
@@ -8573,10 +8737,18 @@ HID_ROCCAT_KONE all=m
HID_ROCCAT_KONEPLUS all=m
HID_ROCCAT_KOVAPLUS all=m
HID_ROCCAT_PYRA all=m
+HID_SUPPORT all=y
+HID_WACOM_POWER_SUPPLY all=y
HVC_ISERIES ppc64=n
HYPERV_BLOCK all=m
HYPERV_MOUSE all=m
I2C_DESIGNWARE powerpc=m
+IBMLANA i386=m
+IBMLS i386=m ppc=n
+IBMMCA_SCSI_DEV_RESET i386=n
+IBMMCA_SCSI_ORDER_STANDARD i386=y
+IBMOL all=m sparc=
+IBMTR alpha=m i386=m
IBM_NEW_EMAC ppc64=m
IBM_NEW_EMAC_DEBUG ppc64=n
IBM_NEW_EMAC_POLL_WEIGHT ppc64=32
@@ -8586,6 +8758,7 @@ IBM_NEW_EMAC_RX_SKB_HEADROOM ppc64=0
IBM_NEW_EMAC_TXB ppc64=64
IIO_RING_BUFFER all=y
INPUT_ATI_REMOTE all=m sparc=n
+IP6_NF_QUEUE all=m
IP6_NF_TARGET_LOG all=m
IP_NF_TARGET_LOG all=m
ISERIES_VETH ppc64=n
@@ -8602,11 +8775,16 @@ LEDS_GPIO_PLATFORM all=y
LEDS_NET5501 all=m
LOGIWII_FF all=y
LOOPBACK_TARGET_CDB_DEBUG all=n
+MADGEMC all=m
+MCA_LEGACY i386=y
+MCA_PROC_FS i386=y
MFD_SUPPORT all=y
MISC_DEVICES all=y
MMC_SDHCI_OF powerpc=m
MTD_DEBUG all=n
+MTD_UBI_DEBUG all=n
MYRI_SBUS sparc=m sparc64=m
+NE2_MCA i386=m
NETDEV_1000 all=y
NETDEV_10000 all=y
NET_ETHERNET all=y
@@ -8619,19 +8797,29 @@ NFC_DEVICES all=y
NFSD_DEPRECATED all=n
NFS_USE_NEW_IDMAPPER all=y
NF_CONNTRACK_RTSP all=m
+PCMCIA_IBMTR all=m ppc=n
+PERF_COUNTERS all=y
POHMELFS all=m
POHMELFS_CRYPTO all=y
POHMELFS_DEBUG all=n
+PROTEON alpha=m i386=m
R8712_AP all=y
+RAMOOPS all=m
RAR_REGISTER all=y
REGULATOR_BQ24022 all=m
RIO all=m
RIO_OLDPCI all=n ia64=y ppc=y ppc64=y
RISCOM8 all=m
SCSI_ARCMSR_AER all=y
+SCSI_FD_MCS i386=m
+SCSI_IBMMCA i386=m
SECURITY_APPARMOR_COMPAT_24=y
+SERIAL_8250_MCA i386=m
SERIAL_MAX3107_AAVA all=m
SIGMA all=m
+SKISA alpha=m i386=m
+SMCTR all=m
+SND_HDA_ENABLE_REALTEK_QUIRKS all=y
SND_INTELMID all=n
SND_INTEL_SST all=m
SND_SOC_CACHE_LZO all=y
@@ -8646,6 +8834,16 @@ STALLION all=m
STMMAC_DUAL_MAC all=y
SX all=m
SYSCTL_SYSCALL_CHECK all=n
+TMS380TR all=m sparc=
+TMSPCI all=m sparc=
+TR all=y sparc=n
+UBIFS_FS_DEBUG all=n
+UBIFS_FS_XATTR all=y
+ULTRAMCA i386=m
+USB_CI13XXX_PCI all=m
+USB_DEVICEFS all=y
+USB_DEVICE_CLASS all=n
+USB_ET61X251 all=m
USB_GADGET_AMD5536UDC all=n
USB_GADGET_AT91 all=n
USB_GADGET_ATMEL_USBA all=n
@@ -8665,7 +8863,11 @@ USB_GADGET_R8A66597 all=n
USB_GADGET_S3C2410 all=n
USB_GADGET_SELECTED all=y
USB_LANGWELL_OTG all=m
+USB_SERIAL_QUATECH_USB2 all=m
WL12XX_HT all=y
+WL12XX_MENU all=m
+WL12XX_SDIO all=m
WL12XX_SDIO_TEST all=m
+WL12XX_SPI all=m
XEN_PLATFORM_PCI all=m
XVMALLOC all=y
diff --git a/kernel-x86.config b/kernel-x86.config
index 2ffc77c..f7c75a9 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -15,7 +15,6 @@ OPTPROBES x86=y
64BIT i386=n x86_64=y
#- file init/Kconfig goes here
#- file kernel/Kconfig.freezer goes here
-#- file kernel/time/Kconfig goes here
SMP x86=y
X86_MPPARSE x86=y
X86_BIGSMP i386=y
@@ -127,8 +126,6 @@ PCI_MMCONFIG x86=y
ISA i386=y
EISA i386=y
#- file drivers/eisa/Kconfig goes here
-MCA i386=y
-#- file drivers/mca/Kconfig goes here
SCx200 i386=m
SCx200HR_TIMER i386=m
OLPC i386=n
@@ -277,4 +274,5 @@ DEBUG_PER_CPU_MAPS x86=n
#- *** PROBABLY REMOVED OPTIONS ***
#-
EARLY_PRINTK_MRST x86=n
+MCA i386=y
X86_MRST i386=y
diff --git a/kernel-zph.patch b/kernel-zph.patch
index 9d7ce7c..05c049b 100644
--- a/kernel-zph.patch
+++ b/kernel-zph.patch
@@ -27,9 +27,9 @@ diff -Nur linux-2.6.26.3/net/ipv4/tcp_input.c linux-2.6.26.3-zph/net/ipv4/tcp_in
--- linux-2.6.26.3/net/ipv4/tcp_input.c 2008-08-20 21:11:37.000000000 +0300
+++ linux-2.6.26.3-zph/net/ipv4/tcp_input.c 2008-08-21 17:06:55.000000000 +0300
@@ -3900,6 +3900,8 @@
- struct tcphdr *th = tcp_hdr(skb);
struct tcp_sock *tp = tcp_sk(sk);
int eaten = -1;
+ bool fragstolen = false;
+ struct inet_sock *inet = inet_sk(sk);
+ struct iphdr *iph = ip_hdr(skb);
diff --git a/kernel.spec b/kernel.spec
index d8b388c..0bb42c2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -89,9 +89,9 @@
%define have_pcmcia 0
%endif
-%define rel 1
-%define basever 3.4
-%define postver .6
+%define rel 0.1
+%define basever 3.5
+%define postver .0
# __alt_kernel is list of features, empty string if none set
# _alt kernel is defined as: %{nil}%{?alt_kernel:-%{?alt_kernel}} (defined in rpm.macros)
@@ -131,7 +131,7 @@ Epoch: 3
License: GPL v2
Group: Base/Kernel
Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
-# Source0-md5: 967f72983655e2479f951195953e8480
+# Source0-md5: 24153eaaa81dedc9481ada8cd9c3b83d
%if "%{postver}" != ".0"
Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
# Patch0-md5: aa1af1c8695c101bfb7e58664c39ffb1
More information about the pld-cvs-commit
mailing list