|
|
|
@ -1,11 +1,6 @@
|
|
|
|
|
#
|
|
|
|
|
# Automatically generated make config: don't edit
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# Linux/x86_64 3.0.0-calculate Kernel Configuration
|
|
|
|
|
=======
|
|
|
|
|
# Linux/x86_64 2.6.39.4-calculate Kernel Configuration
|
|
|
|
|
# Fri Aug 12 13:09:36 2011
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
#
|
|
|
|
|
CONFIG_64BIT=y
|
|
|
|
|
# CONFIG_X86_32 is not set
|
|
|
|
@ -57,10 +52,6 @@ CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -
|
|
|
|
|
# CONFIG_KTIME_SCALAR is not set
|
|
|
|
|
CONFIG_ARCH_CPU_PROBE_RELEASE=y
|
|
|
|
|
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_CONSTRUCTORS=y
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_HAVE_IRQ_WORK=y
|
|
|
|
|
CONFIG_IRQ_WORK=y
|
|
|
|
|
|
|
|
|
@ -82,10 +73,7 @@ CONFIG_HAVE_KERNEL_LZO=y
|
|
|
|
|
# CONFIG_KERNEL_LZMA is not set
|
|
|
|
|
CONFIG_KERNEL_XZ=y
|
|
|
|
|
# CONFIG_KERNEL_LZO is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_DEFAULT_HOSTNAME="calculate"
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SWAP=y
|
|
|
|
|
CONFIG_SYSVIPC=y
|
|
|
|
|
CONFIG_SYSVIPC_SYSCTL=y
|
|
|
|
@ -115,10 +103,7 @@ CONFIG_SPARSE_IRQ=y
|
|
|
|
|
# RCU Subsystem
|
|
|
|
|
#
|
|
|
|
|
CONFIG_TREE_RCU=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_TREE_PREEMPT_RCU is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_PREEMPT_RCU is not set
|
|
|
|
|
# CONFIG_RCU_TRACE is not set
|
|
|
|
|
CONFIG_RCU_FANOUT=32
|
|
|
|
@ -131,10 +116,6 @@ CONFIG_LOG_BUF_SHIFT=15
|
|
|
|
|
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
|
|
|
|
|
CONFIG_CGROUPS=y
|
|
|
|
|
# CONFIG_CGROUP_DEBUG is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_CGROUP_NS is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_CGROUP_FREEZER is not set
|
|
|
|
|
# CONFIG_CGROUP_DEVICE is not set
|
|
|
|
|
# CONFIG_CPUSETS is not set
|
|
|
|
@ -177,10 +158,6 @@ CONFIG_UID16=y
|
|
|
|
|
CONFIG_SYSCTL_SYSCALL=y
|
|
|
|
|
CONFIG_KALLSYMS=y
|
|
|
|
|
# CONFIG_KALLSYMS_ALL is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_KALLSYMS_EXTRA_PASS is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_HOTPLUG=y
|
|
|
|
|
CONFIG_PRINTK=y
|
|
|
|
|
CONFIG_BUG=y
|
|
|
|
@ -362,17 +339,10 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
|
|
|
|
|
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
|
|
|
|
|
CONFIG_DIRECT_GBPAGES=y
|
|
|
|
|
# CONFIG_NUMA is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_ARCH_SPARSEMEM_ENABLE=y
|
|
|
|
|
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
|
|
|
|
|
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
|
|
|
|
|
CONFIG_ARCH_PROC_KCORE_TEXT=y
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_ARCH_PROC_KCORE_TEXT=y
|
|
|
|
|
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
|
|
|
|
|
CONFIG_ARCH_SPARSEMEM_ENABLE=y
|
|
|
|
|
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
|
|
|
|
|
CONFIG_SELECT_MEMORY_MODEL=y
|
|
|
|
|
CONFIG_SPARSEMEM_MANUAL=y
|
|
|
|
@ -397,10 +367,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
|
|
|
|
|
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
|
|
|
|
|
# CONFIG_MEMORY_FAILURE is not set
|
|
|
|
|
# CONFIG_TRANSPARENT_HUGEPAGE is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_CLEANCACHE is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
|
|
|
|
|
CONFIG_X86_RESERVE_LOW=64
|
|
|
|
|
CONFIG_MTRR=y
|
|
|
|
@ -443,10 +410,6 @@ CONFIG_PM_SLEEP_SMP=y
|
|
|
|
|
CONFIG_PM_RUNTIME=y
|
|
|
|
|
CONFIG_PM=y
|
|
|
|
|
CONFIG_PM_DEBUG=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_PM_VERBOSE is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_PM_ADVANCED_DEBUG=y
|
|
|
|
|
CONFIG_CAN_PM_TRACE=y
|
|
|
|
|
# CONFIG_PM_TRACE_RTC is not set
|
|
|
|
@ -454,10 +417,6 @@ CONFIG_ACPI=y
|
|
|
|
|
CONFIG_ACPI_SLEEP=y
|
|
|
|
|
CONFIG_ACPI_PROCFS=y
|
|
|
|
|
CONFIG_ACPI_PROCFS_POWER=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_ACPI_POWER_METER=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_ACPI_EC_DEBUGFS is not set
|
|
|
|
|
CONFIG_ACPI_PROC_EVENT=y
|
|
|
|
|
CONFIG_ACPI_AC=m
|
|
|
|
@ -486,10 +445,6 @@ CONFIG_SFI=y
|
|
|
|
|
#
|
|
|
|
|
CONFIG_CPU_FREQ=y
|
|
|
|
|
CONFIG_CPU_FREQ_TABLE=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_CPU_FREQ_DEBUG is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_CPU_FREQ_STAT=y
|
|
|
|
|
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
|
|
|
|
|
# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
|
|
|
|
@ -503,11 +458,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND=y
|
|
|
|
|
CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# x86 CPU frequency scaling drivers
|
|
|
|
|
=======
|
|
|
|
|
# CPUFreq processor drivers
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
#
|
|
|
|
|
CONFIG_X86_PCC_CPUFREQ=m
|
|
|
|
|
CONFIG_X86_ACPI_CPUFREQ=m
|
|
|
|
@ -899,10 +850,7 @@ CONFIG_NET_SCH_NETEM=m
|
|
|
|
|
CONFIG_NET_SCH_DRR=m
|
|
|
|
|
CONFIG_NET_SCH_MQPRIO=m
|
|
|
|
|
CONFIG_NET_SCH_CHOKE=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_NET_SCH_QFQ=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_NET_SCH_INGRESS=m
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
@ -942,7 +890,6 @@ CONFIG_NET_CLS_IND=y
|
|
|
|
|
CONFIG_NET_SCH_FIFO=y
|
|
|
|
|
# CONFIG_DCB is not set
|
|
|
|
|
CONFIG_DNS_RESOLVER=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_BATMAN_ADV=m
|
|
|
|
|
# CONFIG_BATMAN_ADV_DEBUG is not set
|
|
|
|
|
CONFIG_RPS=y
|
|
|
|
@ -950,12 +897,6 @@ CONFIG_RFS_ACCEL=y
|
|
|
|
|
CONFIG_XPS=y
|
|
|
|
|
CONFIG_HAVE_BPF_JIT=y
|
|
|
|
|
# CONFIG_BPF_JIT is not set
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_BATMAN_ADV is not set
|
|
|
|
|
CONFIG_RPS=y
|
|
|
|
|
CONFIG_RFS_ACCEL=y
|
|
|
|
|
CONFIG_XPS=y
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Network testing
|
|
|
|
@ -1048,10 +989,6 @@ CONFIG_EXTRA_FIRMWARE=""
|
|
|
|
|
# CONFIG_DEBUG_DRIVER is not set
|
|
|
|
|
# CONFIG_DEBUG_DEVRES is not set
|
|
|
|
|
# CONFIG_SYS_HYPERVISOR is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_ARCH_NO_SYSDEV_OPS=y
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_CONNECTOR=y
|
|
|
|
|
CONFIG_PROC_EVENTS=y
|
|
|
|
|
# CONFIG_MTD is not set
|
|
|
|
@ -1103,10 +1040,7 @@ CONFIG_MISC_DEVICES=y
|
|
|
|
|
# CONFIG_AD525X_DPOT is not set
|
|
|
|
|
CONFIG_IBM_ASM=m
|
|
|
|
|
CONFIG_PHANTOM=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_INTEL_MID_PTI is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SGI_IOC4=m
|
|
|
|
|
CONFIG_TIFM_CORE=m
|
|
|
|
|
CONFIG_TIFM_7XX1=m
|
|
|
|
@ -1247,10 +1181,7 @@ CONFIG_SCSI_EATA_LINKED_COMMANDS=y
|
|
|
|
|
CONFIG_SCSI_EATA_MAX_TAGS=16
|
|
|
|
|
CONFIG_SCSI_FUTURE_DOMAIN=m
|
|
|
|
|
CONFIG_SCSI_GDTH=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_SCSI_ISCI=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SCSI_IPS=m
|
|
|
|
|
CONFIG_SCSI_INITIO=m
|
|
|
|
|
CONFIG_SCSI_INIA100=m
|
|
|
|
@ -1445,10 +1376,6 @@ CONFIG_PHYLIB=m
|
|
|
|
|
# CONFIG_VITESSE_PHY is not set
|
|
|
|
|
CONFIG_SMSC_PHY=m
|
|
|
|
|
CONFIG_BROADCOM_PHY=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_BCM63XX_PHY is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_ICPLUS_PHY is not set
|
|
|
|
|
# CONFIG_REALTEK_PHY is not set
|
|
|
|
|
# CONFIG_NATIONAL_PHY is not set
|
|
|
|
@ -1607,17 +1534,10 @@ CONFIG_ATH5K_PCI=y
|
|
|
|
|
CONFIG_ATH9K_HW=m
|
|
|
|
|
CONFIG_ATH9K_COMMON=m
|
|
|
|
|
CONFIG_ATH9K=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_ATH9K_PCI=y
|
|
|
|
|
CONFIG_ATH9K_AHB=y
|
|
|
|
|
CONFIG_ATH9K_RATE_CONTROL=y
|
|
|
|
|
CONFIG_ATH9K_HTC=m
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_ATH9K_RATE_CONTROL=y
|
|
|
|
|
CONFIG_ATH9K_HTC=m
|
|
|
|
|
CONFIG_AR9170_USB=m
|
|
|
|
|
CONFIG_AR9170_LEDS=y
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_CARL9170 is not set
|
|
|
|
|
CONFIG_B43=m
|
|
|
|
|
CONFIG_B43_PCI_AUTOSELECT=y
|
|
|
|
@ -1664,10 +1584,7 @@ CONFIG_IWLAGN=m
|
|
|
|
|
# Debugging Options
|
|
|
|
|
#
|
|
|
|
|
# CONFIG_IWLWIFI_DEBUG is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_IWLWIFI_DEVICE_SVTOOL is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_IWL_P2P is not set
|
|
|
|
|
CONFIG_IWLWIFI_LEGACY=m
|
|
|
|
|
|
|
|
|
@ -1711,28 +1628,18 @@ CONFIG_RT73USB=m
|
|
|
|
|
CONFIG_RT2800USB=m
|
|
|
|
|
CONFIG_RT2800USB_RT33XX=y
|
|
|
|
|
CONFIG_RT2800USB_RT35XX=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_RT2800USB_RT53XX=y
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_RT2800USB_UNKNOWN=y
|
|
|
|
|
CONFIG_RT2800_LIB=m
|
|
|
|
|
CONFIG_RT2X00_LIB_PCI=m
|
|
|
|
|
CONFIG_RT2X00_LIB_USB=m
|
|
|
|
|
CONFIG_RT2X00_LIB=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_RT2X00_LIB_HT=y
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_RT2X00_LIB_FIRMWARE=y
|
|
|
|
|
CONFIG_RT2X00_LIB_CRYPTO=y
|
|
|
|
|
CONFIG_RT2X00_LIB_LEDS=y
|
|
|
|
|
# CONFIG_RT2X00_DEBUG is not set
|
|
|
|
|
CONFIG_RTL8192CE=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_RTL8192SE=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_RTL8192CU=m
|
|
|
|
|
CONFIG_RTLWIFI=m
|
|
|
|
|
CONFIG_RTL8192C_COMMON=m
|
|
|
|
@ -1746,11 +1653,8 @@ CONFIG_WL12XX_SDIO=m
|
|
|
|
|
CONFIG_WL12XX_PLATFORM_DATA=y
|
|
|
|
|
CONFIG_ZD1211RW=m
|
|
|
|
|
# CONFIG_ZD1211RW_DEBUG is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_MWIFIEX=m
|
|
|
|
|
CONFIG_MWIFIEX_SDIO=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# WiMAX Wireless Broadband devices
|
|
|
|
@ -1790,10 +1694,7 @@ CONFIG_USB_EPSON2888=y
|
|
|
|
|
CONFIG_USB_KC2190=y
|
|
|
|
|
CONFIG_USB_NET_ZAURUS=m
|
|
|
|
|
# CONFIG_USB_NET_CX82310_ETH is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_USB_NET_KALMIA=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_USB_HSO=m
|
|
|
|
|
CONFIG_USB_NET_INT51X1=m
|
|
|
|
|
CONFIG_USB_IPHETH=m
|
|
|
|
@ -1863,10 +1764,7 @@ CONFIG_INPUT_EVDEV=y
|
|
|
|
|
#
|
|
|
|
|
CONFIG_INPUT_KEYBOARD=y
|
|
|
|
|
# CONFIG_KEYBOARD_ADP5588 is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_KEYBOARD_ADP5589 is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_KEYBOARD_ATKBD=y
|
|
|
|
|
# CONFIG_KEYBOARD_QT1070 is not set
|
|
|
|
|
# CONFIG_KEYBOARD_QT2160 is not set
|
|
|
|
@ -1875,10 +1773,7 @@ CONFIG_KEYBOARD_ATKBD=y
|
|
|
|
|
# CONFIG_KEYBOARD_LM8323 is not set
|
|
|
|
|
# CONFIG_KEYBOARD_MAX7359 is not set
|
|
|
|
|
# CONFIG_KEYBOARD_MCS is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_KEYBOARD_MPR121 is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_KEYBOARD_NEWTON is not set
|
|
|
|
|
# CONFIG_KEYBOARD_OPENCORES is not set
|
|
|
|
|
# CONFIG_KEYBOARD_STOWAWAY is not set
|
|
|
|
@ -1996,10 +1891,7 @@ CONFIG_SERIAL_NONSTANDARD=y
|
|
|
|
|
# CONFIG_ISI is not set
|
|
|
|
|
# CONFIG_N_HDLC is not set
|
|
|
|
|
# CONFIG_N_GSM is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_TRACE_SINK is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_DEVKMEM=y
|
|
|
|
|
# CONFIG_STALDRV is not set
|
|
|
|
|
|
|
|
|
@ -2026,10 +1918,7 @@ CONFIG_SERIAL_CORE=y
|
|
|
|
|
# CONFIG_SERIAL_ALTERA_JTAGUART is not set
|
|
|
|
|
# CONFIG_SERIAL_ALTERA_UART is not set
|
|
|
|
|
# CONFIG_SERIAL_PCH_UART is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_SERIAL_XILINX_PS_UART is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_PRINTER=y
|
|
|
|
|
# CONFIG_LP_CONSOLE is not set
|
|
|
|
|
# CONFIG_PPDEV is not set
|
|
|
|
@ -2137,7 +2026,6 @@ CONFIG_I2C_STUB=m
|
|
|
|
|
#
|
|
|
|
|
# PPS generators support
|
|
|
|
|
#
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# PTP clock support
|
|
|
|
@ -2146,8 +2034,6 @@ CONFIG_I2C_STUB=m
|
|
|
|
|
#
|
|
|
|
|
# Enable Device Drivers -> PPS to see the PTP clock options.
|
|
|
|
|
#
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
|
|
|
|
|
# CONFIG_GPIOLIB is not set
|
|
|
|
|
# CONFIG_W1 is not set
|
|
|
|
@ -2155,19 +2041,13 @@ CONFIG_POWER_SUPPLY=y
|
|
|
|
|
# CONFIG_POWER_SUPPLY_DEBUG is not set
|
|
|
|
|
# CONFIG_PDA_POWER is not set
|
|
|
|
|
# CONFIG_TEST_POWER is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_BATTERY_DS2780 is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_BATTERY_DS2782 is not set
|
|
|
|
|
# CONFIG_BATTERY_BQ20Z75 is not set
|
|
|
|
|
# CONFIG_BATTERY_BQ27x00 is not set
|
|
|
|
|
# CONFIG_BATTERY_MAX17040 is not set
|
|
|
|
|
# CONFIG_BATTERY_MAX17042 is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_CHARGER_MAX8903 is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_HWMON=m
|
|
|
|
|
CONFIG_HWMON_VID=m
|
|
|
|
|
# CONFIG_HWMON_DEBUG_CHIP is not set
|
|
|
|
@ -2192,10 +2072,7 @@ CONFIG_SENSORS_ADT7475=m
|
|
|
|
|
CONFIG_SENSORS_ASC7621=m
|
|
|
|
|
CONFIG_SENSORS_K8TEMP=m
|
|
|
|
|
CONFIG_SENSORS_K10TEMP=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_SENSORS_FAM15H_POWER=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SENSORS_ASB100=m
|
|
|
|
|
CONFIG_SENSORS_ATXP1=m
|
|
|
|
|
CONFIG_SENSORS_DS620=m
|
|
|
|
@ -2209,10 +2086,6 @@ CONFIG_SENSORS_G760A=m
|
|
|
|
|
CONFIG_SENSORS_GL518SM=m
|
|
|
|
|
CONFIG_SENSORS_GL520SM=m
|
|
|
|
|
CONFIG_SENSORS_CORETEMP=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_SENSORS_PKGTEMP is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SENSORS_IT87=m
|
|
|
|
|
# CONFIG_SENSORS_JC42 is not set
|
|
|
|
|
CONFIG_SENSORS_LINEAGE=m
|
|
|
|
@ -2233,43 +2106,29 @@ CONFIG_SENSORS_LTC4215=m
|
|
|
|
|
CONFIG_SENSORS_LTC4245=m
|
|
|
|
|
CONFIG_SENSORS_LTC4261=m
|
|
|
|
|
CONFIG_SENSORS_LM95241=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_SENSORS_MAX16065=m
|
|
|
|
|
CONFIG_SENSORS_MAX1619=m
|
|
|
|
|
CONFIG_SENSORS_MAX6639=m
|
|
|
|
|
CONFIG_SENSORS_MAX6642=m
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_SENSORS_MAX1619=m
|
|
|
|
|
CONFIG_SENSORS_MAX6639=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SENSORS_MAX6650=m
|
|
|
|
|
CONFIG_SENSORS_PC87360=m
|
|
|
|
|
CONFIG_SENSORS_PC87427=m
|
|
|
|
|
CONFIG_SENSORS_PCF8591=m
|
|
|
|
|
CONFIG_PMBUS=m
|
|
|
|
|
CONFIG_SENSORS_PMBUS=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_SENSORS_ADM1275=m
|
|
|
|
|
CONFIG_SENSORS_MAX16064=m
|
|
|
|
|
CONFIG_SENSORS_MAX34440=m
|
|
|
|
|
CONFIG_SENSORS_MAX8688=m
|
|
|
|
|
CONFIG_SENSORS_UCD9000=m
|
|
|
|
|
CONFIG_SENSORS_UCD9200=m
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_SENSORS_MAX16064=m
|
|
|
|
|
CONFIG_SENSORS_MAX34440=m
|
|
|
|
|
CONFIG_SENSORS_MAX8688=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SENSORS_SHT21=m
|
|
|
|
|
CONFIG_SENSORS_SIS5595=m
|
|
|
|
|
CONFIG_SENSORS_SMM665=m
|
|
|
|
|
CONFIG_SENSORS_DME1737=m
|
|
|
|
|
CONFIG_SENSORS_EMC1403=m
|
|
|
|
|
CONFIG_SENSORS_EMC2103=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_SENSORS_EMC6W201=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SENSORS_SMSC47M1=m
|
|
|
|
|
CONFIG_SENSORS_SMSC47M192=m
|
|
|
|
|
CONFIG_SENSORS_SMSC47B397=m
|
|
|
|
@ -2300,10 +2159,7 @@ CONFIG_SENSORS_APPLESMC=m
|
|
|
|
|
#
|
|
|
|
|
# ACPI drivers
|
|
|
|
|
#
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_SENSORS_ACPI_POWER=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SENSORS_ATK0110=m
|
|
|
|
|
CONFIG_THERMAL=y
|
|
|
|
|
CONFIG_WATCHDOG=y
|
|
|
|
@ -2376,7 +2232,6 @@ CONFIG_SSB_SDIOHOST=y
|
|
|
|
|
# CONFIG_SSB_DEBUG is not set
|
|
|
|
|
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
|
|
|
|
|
CONFIG_SSB_DRIVER_PCICORE=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_BCMA_POSSIBLE=y
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
@ -2386,8 +2241,6 @@ CONFIG_BCMA=m
|
|
|
|
|
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
|
|
|
|
|
CONFIG_BCMA_HOST_PCI=y
|
|
|
|
|
# CONFIG_BCMA_DEBUG is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_MFD_SUPPORT=y
|
|
|
|
|
CONFIG_MFD_CORE=m
|
|
|
|
|
# CONFIG_MFD_SM501 is not set
|
|
|
|
@ -2435,13 +2288,9 @@ CONFIG_IR_ENE=m
|
|
|
|
|
CONFIG_IR_IMON=m
|
|
|
|
|
CONFIG_IR_MCEUSB=m
|
|
|
|
|
CONFIG_IR_ITE_CIR=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_IR_FINTEK=m
|
|
|
|
|
# CONFIG_IR_NUVOTON is not set
|
|
|
|
|
CONFIG_IR_REDRAT3=m
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_IR_NUVOTON is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_IR_STREAMZAP=m
|
|
|
|
|
CONFIG_IR_WINBOND_CIR=m
|
|
|
|
|
CONFIG_RC_LOOPBACK=m
|
|
|
|
@ -2467,10 +2316,7 @@ CONFIG_MEDIA_TUNER_MXL5007T=m
|
|
|
|
|
CONFIG_MEDIA_TUNER_MC44S803=m
|
|
|
|
|
CONFIG_MEDIA_TUNER_MAX2165=m
|
|
|
|
|
CONFIG_MEDIA_TUNER_TDA18218=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_MEDIA_TUNER_TDA18212=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_VIDEO_V4L2=m
|
|
|
|
|
CONFIG_VIDEOBUF_GEN=m
|
|
|
|
|
CONFIG_VIDEOBUF_DMA_SG=m
|
|
|
|
@ -2488,11 +2334,7 @@ CONFIG_VIDEO_HELPER_CHIPS_AUTO=y
|
|
|
|
|
CONFIG_VIDEO_IR_I2C=m
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# Audio decoders, processors and mixers
|
|
|
|
|
=======
|
|
|
|
|
# Audio decoders
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
#
|
|
|
|
|
CONFIG_VIDEO_TVAUDIO=m
|
|
|
|
|
CONFIG_VIDEO_TDA7432=m
|
|
|
|
@ -2502,10 +2344,6 @@ CONFIG_VIDEO_TEA6420=m
|
|
|
|
|
CONFIG_VIDEO_MSP3400=m
|
|
|
|
|
CONFIG_VIDEO_CS5345=m
|
|
|
|
|
CONFIG_VIDEO_CS53L32A=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_VIDEO_M52790=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_VIDEO_WM8775=m
|
|
|
|
|
CONFIG_VIDEO_WM8739=m
|
|
|
|
|
CONFIG_VIDEO_VP27SMPX=m
|
|
|
|
@ -2523,26 +2361,15 @@ CONFIG_VIDEO_BT819=m
|
|
|
|
|
CONFIG_VIDEO_BT856=m
|
|
|
|
|
CONFIG_VIDEO_BT866=m
|
|
|
|
|
CONFIG_VIDEO_KS0127=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_VIDEO_SAA7110=m
|
|
|
|
|
CONFIG_VIDEO_SAA711X=m
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_VIDEO_OV7670=m
|
|
|
|
|
CONFIG_VIDEO_MT9V011=m
|
|
|
|
|
CONFIG_VIDEO_SAA7110=m
|
|
|
|
|
CONFIG_VIDEO_SAA711X=m
|
|
|
|
|
CONFIG_VIDEO_SAA717X=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_VIDEO_TVP5150=m
|
|
|
|
|
CONFIG_VIDEO_VPX3220=m
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Video and audio decoders
|
|
|
|
|
#
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_VIDEO_SAA717X=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_VIDEO_CX25840=m
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
@ -2559,27 +2386,21 @@ CONFIG_VIDEO_ADV7170=m
|
|
|
|
|
CONFIG_VIDEO_ADV7175=m
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# Camera sensor devices
|
|
|
|
|
#
|
|
|
|
|
CONFIG_VIDEO_OV7670=m
|
|
|
|
|
CONFIG_VIDEO_MT9V011=m
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# Video improvement chips
|
|
|
|
|
#
|
|
|
|
|
CONFIG_VIDEO_UPD64031A=m
|
|
|
|
|
CONFIG_VIDEO_UPD64083=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Miscelaneous helper chips
|
|
|
|
|
#
|
|
|
|
|
CONFIG_VIDEO_M52790=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_VIDEO_VIVI is not set
|
|
|
|
|
CONFIG_VIDEO_BT848=m
|
|
|
|
|
CONFIG_VIDEO_BT848_DVB=y
|
|
|
|
@ -2648,10 +2469,7 @@ CONFIG_USB_GSPCA_CPIA1=m
|
|
|
|
|
CONFIG_USB_GSPCA_ETOMS=m
|
|
|
|
|
CONFIG_USB_GSPCA_FINEPIX=m
|
|
|
|
|
CONFIG_USB_GSPCA_JEILINJ=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_USB_GSPCA_KINECT=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_USB_GSPCA_KONICA is not set
|
|
|
|
|
CONFIG_USB_GSPCA_MARS=m
|
|
|
|
|
CONFIG_USB_GSPCA_MR97310A=m
|
|
|
|
@ -2708,10 +2526,6 @@ CONFIG_USB_S2255=m
|
|
|
|
|
# CONFIG_V4L_MEM2MEM_DRIVERS is not set
|
|
|
|
|
CONFIG_RADIO_ADAPTERS=y
|
|
|
|
|
CONFIG_RADIO_MAXIRADIO=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_RADIO_MAESTRO=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_I2C_SI4713=m
|
|
|
|
|
CONFIG_RADIO_SI4713=m
|
|
|
|
|
CONFIG_USB_DSBR=m
|
|
|
|
@ -2888,11 +2702,7 @@ CONFIG_DVB_SP887X=m
|
|
|
|
|
CONFIG_DVB_CX22700=m
|
|
|
|
|
CONFIG_DVB_CX22702=m
|
|
|
|
|
CONFIG_DVB_S5H1432=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_DVB_DRXD=m
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_DVB_DRX397XD=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_DVB_L64781=m
|
|
|
|
|
CONFIG_DVB_TDA1004X=m
|
|
|
|
|
CONFIG_DVB_NXT6000=m
|
|
|
|
@ -2907,10 +2717,7 @@ CONFIG_DVB_TDA10048=m
|
|
|
|
|
CONFIG_DVB_AF9013=m
|
|
|
|
|
CONFIG_DVB_EC100=m
|
|
|
|
|
CONFIG_DVB_STV0367=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_DVB_CXD2820R=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# DVB-C (cable) frontends
|
|
|
|
@ -3066,10 +2873,7 @@ CONFIG_BACKLIGHT_GENERIC=m
|
|
|
|
|
CONFIG_BACKLIGHT_APPLE=m
|
|
|
|
|
# CONFIG_BACKLIGHT_SAHARA is not set
|
|
|
|
|
# CONFIG_BACKLIGHT_ADP8860 is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_BACKLIGHT_ADP8870=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Display device support
|
|
|
|
@ -3188,16 +2992,10 @@ CONFIG_SND_ENS1371=m
|
|
|
|
|
CONFIG_SND_ES1938=m
|
|
|
|
|
CONFIG_SND_ES1968=m
|
|
|
|
|
CONFIG_SND_ES1968_INPUT=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_SND_ES1968_RADIO=y
|
|
|
|
|
CONFIG_SND_FM801=m
|
|
|
|
|
CONFIG_SND_FM801_TEA575X_BOOL=y
|
|
|
|
|
CONFIG_SND_TEA575X=m
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_SND_FM801=m
|
|
|
|
|
CONFIG_SND_FM801_TEA575X_BOOL=y
|
|
|
|
|
CONFIG_SND_FM801_TEA575X=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SND_HDA_INTEL=m
|
|
|
|
|
CONFIG_SND_HDA_HWDEP=y
|
|
|
|
|
CONFIG_SND_HDA_RECONFIG=y
|
|
|
|
@ -3225,10 +3023,7 @@ CONFIG_SND_ICE1724=m
|
|
|
|
|
CONFIG_SND_INTEL8X0=m
|
|
|
|
|
CONFIG_SND_INTEL8X0M=m
|
|
|
|
|
CONFIG_SND_KORG1212=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_SND_LOLA=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SND_LX6464ES=m
|
|
|
|
|
CONFIG_SND_MAESTRO3=m
|
|
|
|
|
CONFIG_SND_MAESTRO3_INPUT=y
|
|
|
|
@ -3257,10 +3052,7 @@ CONFIG_SND_USB_6FIRE=m
|
|
|
|
|
CONFIG_SND_FIREWIRE=y
|
|
|
|
|
CONFIG_SND_FIREWIRE_LIB=m
|
|
|
|
|
CONFIG_SND_FIREWIRE_SPEAKERS=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_SND_ISIGHT=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_SND_PCMCIA=y
|
|
|
|
|
# CONFIG_SND_VXPOCKET is not set
|
|
|
|
|
# CONFIG_SND_PDAUDIOCF is not set
|
|
|
|
@ -3281,19 +3073,11 @@ CONFIG_USB_HID=y
|
|
|
|
|
#
|
|
|
|
|
# Special HID drivers
|
|
|
|
|
#
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_HID_3M_PCT=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_HID_A4TECH=y
|
|
|
|
|
CONFIG_HID_ACRUX=m
|
|
|
|
|
CONFIG_HID_ACRUX_FF=m
|
|
|
|
|
CONFIG_HID_APPLE=y
|
|
|
|
|
CONFIG_HID_BELKIN=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_HID_CANDO=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_HID_CHERRY=y
|
|
|
|
|
CONFIG_HID_CHICONY=y
|
|
|
|
|
CONFIG_HID_PRODIKEYS=m
|
|
|
|
@ -3318,10 +3102,6 @@ CONFIG_LOGIG940_FF=y
|
|
|
|
|
CONFIG_LOGIWII_FF=y
|
|
|
|
|
CONFIG_HID_MAGICMOUSE=m
|
|
|
|
|
CONFIG_HID_MICROSOFT=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_HID_MOSART=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_HID_MONTEREY=y
|
|
|
|
|
CONFIG_HID_MULTITOUCH=m
|
|
|
|
|
CONFIG_HID_NTRIG=m
|
|
|
|
@ -3344,10 +3124,6 @@ CONFIG_HID_ROCCAT_KOVAPLUS=m
|
|
|
|
|
CONFIG_HID_ROCCAT_PYRA=m
|
|
|
|
|
CONFIG_HID_SAMSUNG=m
|
|
|
|
|
CONFIG_HID_SONY=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_HID_STANTUM=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_HID_SUNPLUS=m
|
|
|
|
|
CONFIG_HID_GREENASIA=m
|
|
|
|
|
CONFIG_GREENASIA_FF=y
|
|
|
|
@ -3500,10 +3276,6 @@ CONFIG_USB_SERIAL_SPCP8X5=m
|
|
|
|
|
CONFIG_USB_SERIAL_HP4X=m
|
|
|
|
|
CONFIG_USB_SERIAL_SAFE=m
|
|
|
|
|
CONFIG_USB_SERIAL_SAFE_PADDED=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_USB_SERIAL_SAMBA=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_USB_SERIAL_SIEMENS_MPI=m
|
|
|
|
|
CONFIG_USB_SERIAL_SIERRAWIRELESS=m
|
|
|
|
|
CONFIG_USB_SERIAL_SYMBOL=m
|
|
|
|
@ -3610,10 +3382,7 @@ CONFIG_MMC_TIFM_SD=m
|
|
|
|
|
CONFIG_MMC_SDRICOH_CS=m
|
|
|
|
|
CONFIG_MMC_CB710=m
|
|
|
|
|
CONFIG_MMC_VIA_SDMMC=m
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_MMC_VUB300=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_MMC_USHC is not set
|
|
|
|
|
CONFIG_MEMSTICK=m
|
|
|
|
|
# CONFIG_MEMSTICK_DEBUG is not set
|
|
|
|
@ -3694,10 +3463,6 @@ CONFIG_UIO=m
|
|
|
|
|
CONFIG_UIO_PCI_GENERIC=m
|
|
|
|
|
# CONFIG_UIO_NETX is not set
|
|
|
|
|
CONFIG_STAGING=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_STAGING_EXCLUDE_BUILD is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_DIGIEPCA is not set
|
|
|
|
|
# CONFIG_RISCOM8 is not set
|
|
|
|
|
# CONFIG_SPECIALIX is not set
|
|
|
|
@ -3708,7 +3473,6 @@ CONFIG_STAGING=y
|
|
|
|
|
# CONFIG_VIDEO_CX25821 is not set
|
|
|
|
|
# CONFIG_VIDEO_TM6000 is not set
|
|
|
|
|
# CONFIG_DVB_CXD2099 is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_USBIP_CORE is not set
|
|
|
|
|
# CONFIG_W35UND is not set
|
|
|
|
|
# CONFIG_PRISM2_USB is not set
|
|
|
|
@ -3717,15 +3481,6 @@ CONFIG_BRCMUTIL=m
|
|
|
|
|
CONFIG_BRCMSMAC=m
|
|
|
|
|
CONFIG_BRCMFMAC=m
|
|
|
|
|
# CONFIG_BRCMDBG is not set
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_USB_IP_COMMON is not set
|
|
|
|
|
# CONFIG_W35UND is not set
|
|
|
|
|
# CONFIG_PRISM2_USB is not set
|
|
|
|
|
# CONFIG_ECHO is not set
|
|
|
|
|
# CONFIG_BRCM80211 is not set
|
|
|
|
|
CONFIG_RT2860=m
|
|
|
|
|
CONFIG_RT2870=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_COMEDI is not set
|
|
|
|
|
# CONFIG_ASUS_OLED is not set
|
|
|
|
|
# CONFIG_PANEL is not set
|
|
|
|
@ -3785,15 +3540,10 @@ CONFIG_DRM_PSB=m
|
|
|
|
|
# Altera FPGA firmware download module
|
|
|
|
|
#
|
|
|
|
|
# CONFIG_ALTERA_STAPL is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_INTEL_MEI is not set
|
|
|
|
|
CONFIG_X86_PLATFORM_DEVICES=y
|
|
|
|
|
CONFIG_ACER_WMI=m
|
|
|
|
|
CONFIG_ACERHDF=m
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_X86_PLATFORM_DEVICES=y
|
|
|
|
|
CONFIG_ACER_WMI=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_ASUS_LAPTOP=m
|
|
|
|
|
CONFIG_DELL_WMI=m
|
|
|
|
|
CONFIG_DELL_WMI_AIO=m
|
|
|
|
@ -3831,11 +3581,8 @@ CONFIG_INTEL_IPS=m
|
|
|
|
|
# CONFIG_IBM_RTL is not set
|
|
|
|
|
CONFIG_XO15_EBOOK=m
|
|
|
|
|
# CONFIG_SAMSUNG_LAPTOP is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_MXM_WMI=m
|
|
|
|
|
CONFIG_INTEL_OAKTRAIL=m
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Firmware Drivers
|
|
|
|
@ -3849,10 +3596,7 @@ CONFIG_DMIID=y
|
|
|
|
|
# CONFIG_DMI_SYSFS is not set
|
|
|
|
|
# CONFIG_ISCSI_IBFT_FIND is not set
|
|
|
|
|
# CONFIG_SIGMA is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_GOOGLE_FIRMWARE is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# File systems
|
|
|
|
@ -3903,11 +3647,7 @@ CONFIG_BTRFS_FS=m
|
|
|
|
|
CONFIG_BTRFS_FS_POSIX_ACL=y
|
|
|
|
|
CONFIG_NILFS2_FS=m
|
|
|
|
|
CONFIG_FS_POSIX_ACL=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_EXPORTFS=m
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_EXPORTFS=y
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_FILE_LOCKING=y
|
|
|
|
|
CONFIG_FSNOTIFY=y
|
|
|
|
|
CONFIG_DNOTIFY=y
|
|
|
|
@ -3969,10 +3709,7 @@ CONFIG_PROC_PAGE_MONITOR=y
|
|
|
|
|
CONFIG_SYSFS=y
|
|
|
|
|
CONFIG_TMPFS=y
|
|
|
|
|
# CONFIG_TMPFS_POSIX_ACL is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_TMPFS_XATTR is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_HUGETLBFS is not set
|
|
|
|
|
# CONFIG_HUGETLB_PAGE is not set
|
|
|
|
|
CONFIG_CONFIGFS_FS=m
|
|
|
|
@ -4009,13 +3746,8 @@ CONFIG_AUFS_BRANCH_MAX_127=y
|
|
|
|
|
# CONFIG_AUFS_BRANCH_MAX_32767 is not set
|
|
|
|
|
CONFIG_AUFS_SBILIST=y
|
|
|
|
|
# CONFIG_AUFS_HNOTIFY is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_AUFS_RDU=y
|
|
|
|
|
CONFIG_AUFS_PROC_MAP=y
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_AUFS_EXPORT is not set
|
|
|
|
|
CONFIG_AUFS_RDU=y
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_AUFS_SP_IATTR is not set
|
|
|
|
|
CONFIG_AUFS_SHWH=y
|
|
|
|
|
CONFIG_AUFS_BR_RAMFS=y
|
|
|
|
@ -4056,10 +3788,6 @@ CONFIG_CIFS_POSIX=y
|
|
|
|
|
# CONFIG_CIFS_DFS_UPCALL is not set
|
|
|
|
|
# CONFIG_CIFS_FSCACHE is not set
|
|
|
|
|
# CONFIG_CIFS_ACL is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_CIFS_EXPERIMENTAL is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_NCP_FS is not set
|
|
|
|
|
# CONFIG_CODA_FS is not set
|
|
|
|
|
# CONFIG_AFS_FS is not set
|
|
|
|
@ -4165,10 +3893,7 @@ CONFIG_TIMER_STATS=y
|
|
|
|
|
# CONFIG_LOCK_STAT is not set
|
|
|
|
|
# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
|
|
|
|
|
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
# CONFIG_DEBUG_STACK_USAGE is not set
|
|
|
|
|
=======
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_DEBUG_KOBJECT is not set
|
|
|
|
|
CONFIG_DEBUG_BUGVERBOSE=y
|
|
|
|
|
# CONFIG_DEBUG_INFO is not set
|
|
|
|
@ -4185,18 +3910,11 @@ CONFIG_ARCH_WANT_FRAME_POINTERS=y
|
|
|
|
|
CONFIG_FRAME_POINTER=y
|
|
|
|
|
# CONFIG_BOOT_PRINTK_DELAY is not set
|
|
|
|
|
# CONFIG_RCU_TORTURE_TEST is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
CONFIG_RCU_CPU_STALL_TIMEOUT=60
|
|
|
|
|
# CONFIG_BACKTRACE_SELF_TEST is not set
|
|
|
|
|
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
|
|
|
|
|
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
|
|
|
|
|
# CONFIG_DEBUG_PER_CPU_MAPS is not set
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_RCU_CPU_STALL_DETECTOR is not set
|
|
|
|
|
# CONFIG_BACKTRACE_SELF_TEST is not set
|
|
|
|
|
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
|
|
|
|
|
# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
|
|
|
|
|
# CONFIG_FAULT_INJECTION is not set
|
|
|
|
|
# CONFIG_LATENCYTOP is not set
|
|
|
|
@ -4229,11 +3947,6 @@ CONFIG_X86_VERBOSE_BOOTUP=y
|
|
|
|
|
CONFIG_EARLY_PRINTK=y
|
|
|
|
|
# CONFIG_EARLY_PRINTK_DBGP is not set
|
|
|
|
|
# CONFIG_DEBUG_STACKOVERFLOW is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
# CONFIG_DEBUG_STACK_USAGE is not set
|
|
|
|
|
# CONFIG_DEBUG_PER_CPU_MAPS is not set
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
# CONFIG_X86_PTDUMP is not set
|
|
|
|
|
CONFIG_DEBUG_RODATA=y
|
|
|
|
|
CONFIG_DEBUG_RODATA_TEST=y
|
|
|
|
@ -4317,10 +4030,6 @@ CONFIG_CRYPTO_ECB=m
|
|
|
|
|
# CONFIG_CRYPTO_LRW is not set
|
|
|
|
|
CONFIG_CRYPTO_PCBC=m
|
|
|
|
|
# CONFIG_CRYPTO_XTS is not set
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_CRYPTO_FPU=m
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
|
# Hash modes
|
|
|
|
@ -4411,11 +4120,6 @@ CONFIG_VIRTIO_BALLOON=m
|
|
|
|
|
CONFIG_RAID6_PQ=m
|
|
|
|
|
CONFIG_BITREVERSE=y
|
|
|
|
|
CONFIG_GENERIC_FIND_FIRST_BIT=y
|
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
=======
|
|
|
|
|
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
|
|
|
|
CONFIG_GENERIC_FIND_LAST_BIT=y
|
|
|
|
|
>>>>>>> 23f6fe9640ad47fdf51838e3ea779c934cac3638
|
|
|
|
|
CONFIG_CRC_CCITT=m
|
|
|
|
|
CONFIG_CRC16=m
|
|
|
|
|
CONFIG_CRC_T10DIF=y
|
|
|
|
|