Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/extra/linux-zen
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-21 10:03:23 +0100
committerErich Eckner <git@eckner.net>2019-01-21 10:03:23 +0100
commitc2b2f00057bd52e54fcdc4ff92f8421e651ce815 (patch)
treee40e3db6f4c572f168da90e5b80127d5f29fa224 /extra/linux-zen
parent7f1e3da67e8b6bbc45c85937d4938547f32076d6 (diff)
parent75b2223f9e8b10faaef8f4f819c142eac8dacb93 (diff)
Merge branch 'master' into i486
Diffstat (limited to 'extra/linux-zen')
-rw-r--r--extra/linux-zen/PKGBUILD6
-rw-r--r--extra/linux-zen/config40
2 files changed, 18 insertions, 28 deletions
diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD
index 96976146..00924ef1 100644
--- a/extra/linux-zen/PKGBUILD
+++ b/extra/linux-zen/PKGBUILD
@@ -1,9 +1,9 @@
-# upstream git revision: 43d12d0306ae85803a356caabd0b384eb917c80e
+# upstream git revision: b77cb22b9c643c946fafe06d5c365e5a75543af1
# fail if upstream's .config changes
for ((i=0; i<${#sha256sums[@]}; i++)); do
- if [ "${sha256sums[${i}]}" = '8a852e70606513c77fc513d6ef970273345cc895d90e3f283ae103853bf50c41' ]; then
- sha256sums[${i}]='0fa2c1eef3f46e1e0f22aa6a4da555cca6234bcd12c8aae84503ce5f6c178348'
+ if [ "${sha256sums[${i}]}" = '3dd1f340c20a43070bc14287521c28e2f818a9288419ceccb4e2eaa73bd3b848' ]; then
+ sha256sums[${i}]='92918d10d49271ae6d2ce6420240d9c167986ad4d5a8bf6be72392be2927b182'
fi
done
diff --git a/extra/linux-zen/config b/extra/linux-zen/config
index cc18ead9..4701f286 100644
--- a/extra/linux-zen/config
+++ b/extra/linux-zen/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.18.10-zen1 Kernel Configuration
+# Linux/x86 4.18.12-zen1 Kernel Configuration
#
#
@@ -3122,10 +3122,6 @@ CONFIG_SLHC=m
CONFIG_SLIP_COMPRESSED=y
CONFIG_SLIP_SMART=y
CONFIG_SLIP_MODE_SLIP6=y
-
-#
-# Host-side USB support is needed for USB Network Adapter support
-#
CONFIG_USB_NET_DRIVERS=m
CONFIG_USB_CATC=m
CONFIG_USB_KAWETH=m
@@ -6635,11 +6631,11 @@ CONFIG_AC97_BUS=m
#
# HID support
#
-CONFIG_HID=m
+CONFIG_HID=y
CONFIG_HID_BATTERY_STRENGTH=y
CONFIG_HIDRAW=y
CONFIG_UHID=m
-CONFIG_HID_GENERIC=m
+CONFIG_HID_GENERIC=y
#
# Special HID drivers
@@ -6750,25 +6746,19 @@ CONFIG_HID_ALPS=m
#
# USB HID support
#
-CONFIG_USB_HID=m
+CONFIG_USB_HID=y
CONFIG_HID_PID=y
CONFIG_USB_HIDDEV=y
#
-# USB HID Boot Protocol drivers
-#
-# CONFIG_USB_KBD is not set
-# CONFIG_USB_MOUSE is not set
-
-#
# I2C HID support
#
CONFIG_I2C_HID=m
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
-CONFIG_USB_COMMON=m
+CONFIG_USB_COMMON=y
CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB=m
+CONFIG_USB=y
CONFIG_USB_PCI=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
@@ -6790,24 +6780,23 @@ CONFIG_USB_WUSB_CBAF=m
# USB Host Controller Drivers
#
CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
+CONFIG_USB_XHCI_HCD=y
# CONFIG_USB_XHCI_DBGCAP is not set
-CONFIG_USB_XHCI_PCI=m
+CONFIG_USB_XHCI_PCI=y
CONFIG_USB_XHCI_PLATFORM=m
-CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_EHCI_PCI=m
+CONFIG_USB_EHCI_PCI=y
CONFIG_USB_EHCI_HCD_PLATFORM=m
CONFIG_USB_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_MAX3421_HCD=m
-CONFIG_USB_OHCI_HCD=m
-CONFIG_USB_OHCI_HCD_PCI=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
CONFIG_USB_OHCI_HCD_PLATFORM=m
-CONFIG_USB_UHCI_HCD=m
+CONFIG_USB_UHCI_HCD=y
CONFIG_USB_U132_HCD=m
CONFIG_USB_SL811_HCD=m
# CONFIG_USB_SL811_HCD_ISO is not set
@@ -6915,7 +6904,8 @@ CONFIG_USB_ISP1760_DUAL_ROLE=y
# USB port drivers
#
CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_CONSOLE=y
CONFIG_USB_SERIAL_GENERIC=y
CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m