Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into samba4

[people/amarx/ipfire-3.x.git] / kernel / config-i686-legacy

diff --git a/kernel/config-i686-legacy b/kernel/config-i686-legacy
deleted file mode 100644 (file)
index bafe9ab..0000000
--- a/kernel/config-i686-legacy
+++ /dev/null
@@ -1,153 +0,0 @@
-CONFIG_PGTABLE_LEVELS=2
-
-#
-# Processor type and features
-#
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-# CONFIG_VMSPLIT_3G_OPT is not set
-# CONFIG_VMSPLIT_2G_OPT is not set
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-
-#
-# Bus options (PCI etc.)
-#
-# CONFIG_PCI_GOOLPC is not set
-CONFIG_PCI_OLPC=y
-
-#
-# PCI host controller drivers
-#
-CONFIG_OLPC=y
-CONFIG_OLPC_XO1_PM=y
-CONFIG_OLPC_XO1_RTC=y
-CONFIG_OLPC_XO1_SCI=y
-CONFIG_OLPC_XO15_SCI=y
-
-#
-# Generic Driver Options
-#
-CONFIG_DMA_CMA=y
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=16
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
-
-#
-# Bus devices
-#
-CONFIG_OF_PROMTREE=y
-
-#
-# Input Device Drivers
-#
-CONFIG_KEYBOARD_STMPE=m
-CONFIG_KEYBOARD_TC3589X=m
-CONFIG_MOUSE_PS2_OLPC=y
-CONFIG_INPUT_MAX77693_HAPTIC=m
-CONFIG_INPUT_MAX8997_HAPTIC=m
-# CONFIG_INPUT_GPIO_BEEPER is not set
-CONFIG_INPUT_PWM_BEEPER=m
-
-#
-# Hardware I/O ports
-#
-# CONFIG_SERIO_OLPC_APSP is not set
-
-#
-# Serial drivers
-#
-# CONFIG_SERIAL_8250_DW is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_OF_PLATFORM=y
-
-#
-# Pin controllers
-#
-CONFIG_PINCTRL_AS3722=y
-
-#
-# MFD GPIO expanders
-#
-CONFIG_GPIO_CS5535=y
-
-#
-# USB GPIO expanders
-#
-CONFIG_BATTERY_OLPC=y
-CONFIG_POWER_RESET_AS3722=y
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_PWM_FAN=m
-
-#
-# ACPI drivers
-#
-# CONFIG_THERMAL_OF is not set
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_RK808=y
-
-#
-# STMicroelectronics STMPE Interface Drivers
-#
-CONFIG_REGULATOR_PWM=m
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_BACKLIGHT_PWM=m
-# CONFIG_BACKLIGHT_LM3630A is not set
-# CONFIG_BACKLIGHT_LP855X is not set
-# CONFIG_BACKLIGHT_LP8788 is not set
-
-#
-# LED drivers
-#
-CONFIG_LEDS_PWM=m
-
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_XO1_RFKILL=m
-# CONFIG_XO15_EBOOK is not set
-
-#
-# Common Clock Framework
-#
-# CONFIG_COMMON_CLK_SI5351 is not set
-CONFIG_COMMON_CLK_PWM=m
-
-#
-# Temperature sensors
-#
-CONFIG_PWM=y
-CONFIG_PWM_SYSFS=y
-CONFIG_PWM_ATMEL_HLCDC_PWM=m
-CONFIG_PWM_CRC=y
-CONFIG_PWM_FSL_FTM=m
-CONFIG_PWM_LP3943=m
-CONFIG_PWM_LPSS=m
-CONFIG_PWM_LPSS_PCI=m
-CONFIG_PWM_LPSS_PLATFORM=m
-CONFIG_PWM_PCA9685=m
-CONFIG_PWM_TWL=m
-CONFIG_PWM_TWL_LED=m
-
-#
-# Random Number Generation
-#
-# CONFIG_CRYPTO_DEV_HIFN_795X is not set