Make kernel/linux-libre-xen actually work

7 files changed, 118 insertions, 237 deletions

diff --git a/kernels/linux-libre-xen/0011-kernfs-fix-removed-error-check.patch b/kernels/linux-libre-xen/0011-kernfs-fix-removed-error-check.patch
deleted file mode 100644
index b597595c6..000000000
--- a/kernels/linux-libre-xen/0011-kernfs-fix-removed-error-check.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
-index 8034706..e01ea4a 100644
---- a/fs/kernfs/file.c
-+++ b/fs/kernfs/file.c
-@@ -484,6 +484,8 @@ static int kernfs_fop_mmap(struct file *file, struct vm_area_struct *vma)
- 
- 	ops = kernfs_ops(of->kn);
- 	rc = ops->mmap(of, vma);
-+	if (rc)
-+		goto out_put;
- 
- 	/*
- 	 * PowerPC's pci_mmap of legacy_mem uses shmem_zero_setup()
diff --git a/kernels/linux-libre-xen/0012-fix-saa7134.patch b/kernels/linux-libre-xen/0012-fix-saa7134.patch
deleted file mode 100644
index 070fbc8eb..000000000
--- a/kernels/linux-libre-xen/0012-fix-saa7134.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/drivers/media/pci/saa7134/saa7134-video.c	
-+++ a/drivers/media/pci/saa7134/saa7134-video.c	
-@@ -1243,6 +1243,7 @@ static int video_release(struct file *file)
- 		videobuf_streamoff(&dev->cap);
- 		res_free(dev, fh, RESOURCE_VIDEO);
- 		videobuf_mmap_free(&dev->cap);
-+		INIT_LIST_HEAD(&dev->cap.stream);
- 	}
- 	if (dev->cap.read_buf) {
- 		buffer_release(&dev->cap, dev->cap.read_buf);
-@@ -1254,6 +1255,7 @@ static int video_release(struct file *file)
- 		videobuf_stop(&dev->vbi);
- 		res_free(dev, fh, RESOURCE_VBI);
- 		videobuf_mmap_free(&dev->vbi);
-+		INIT_LIST_HEAD(&dev->vbi.stream);
- 	}
- 
- 	/* ts-capture will not work in planar mode, so turn it off Hac: 04.05*/
-@@ -1987,17 +1989,12 @@ int saa7134_streamoff(struct file *file, void *priv,
- 					enum v4l2_buf_type type)
- {
- 	struct saa7134_dev *dev = video_drvdata(file);
--	int err;
- 	int res = saa7134_resource(file);
- 
- 	if (res != RESOURCE_EMPRESS)
- 		pm_qos_remove_request(&dev->qos_request);
- 
--	err = videobuf_streamoff(saa7134_queue(file));
--	if (err < 0)
--		return err;
--	res_free(dev, priv, res);
--	return 0;
-+	return videobuf_streamoff(saa7134_queue(file));
- }
- EXPORT_SYMBOL_GPL(saa7134_streamoff);
-
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 27a9817ef..bdbc9d9d8 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,41 +1,54 @@
-# $Id: PKGBUILD 215933 2014-07-01 05:46:28Z tpowa $
-# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
-# Contributor (Arch): Thomas Baechler <thomas@archlinux.org>
+# $Id$
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Thomas Baechler <thomas@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor: Sorin-Mihai Vârgolici <smv@yobicore.org>
+# Contributor: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
-pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
-#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.15
-pkgver=${_basekernel}.3
-pkgrel=1
+pkgbase=linux-libre-xen
+
+_srcbase=linux
+_srcmajor=3.15
+_srcminor=3
+pkgver=${_srcmajor}.${_srcminor}
+
+pkgrel=2
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc')
 options=('!strip')
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_srcmajor}-gnu/linux-libre-${_srcmajor}-gnu.tar.xz"
         # the main kernel config files
         'config'
         # standard config files for mkinitcpio ramdisk
-        "${pkgbase}.preset"
+        'linux.preset'
         'boot-logo.patch'
-        'change-default-console-loglevel.patch')
+        'change-default-console-loglevel.patch'
+        )
+if [[ $pkgver != $_srcmajor ]]; then
+	source+=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_srcmajor}-gnu-${pkgver}-gnu.xz")
+fi
+
 sha256sums=('93450dc189131b6a4de862f35c5087a58cc7bae1c24caa535d2357cc3301b688'
-            'dfd23e705edfc0f6fcf0df1a98e58ec7ae835ec780d7092810b664093d91cd5f'
-            '4e07667d502ddbf6368169de57ebdc5bd7923cc8b37cbd2739c1260aece1b3a7'
-            '7a475ada892857397cf80d2de777825ae94758dc2d9dfa3754ae3d670f4a2f02'
+            '276d16a06e9fa55b79e2f5604a500071b6a42f00836175aa3e4b045f469d43a8'
+            'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '8303b426b1a6dce456b2350003558ae312d21cab0ae6c1f0d7b9d21395f4e177'
-            'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182')
+            'faced4eb4c47c4eb1a9ee8a5bf8a7c4b49d6b4d78efbe426e410730e6267d182'
+            'dfd23e705edfc0f6fcf0df1a98e58ec7ae835ec780d7092810b664093d91cd5f')
 
-_kernelname=${pkgbase#linux-libre}
-_localversionname=-LIBRE-XEN
+_srcname=linux-${_srcmajor}
+_kernelname=${pkgbase#linux}
+_replaces=(kernel26 kernel26-libre linux)
 
 prepare() {
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
-  if [ "${_basekernel}" != "${pkgver}" ]; then
-    patch -p1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+  if [ "${_srcmajor}" != "${pkgver}" ]; then
+    patch -p1 -i "${srcdir}/patch-${_srcmajor}-gnu-${pkgver}-gnu"
   fi
 
   # add freedo as boot logo
@@ -49,10 +62,10 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  cat "${srcdir}/config" > ./.config # simpler
+  cat "${srcdir}/config" > ./.config
 
   if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config
+    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
     sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config
   fi
 
@@ -78,23 +91,23 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
   make ${MAKEFLAGS} LOCALVERSION= bzImage modules
 }
 
 _package() {
-  pkgdesc="The ${pkgbase^} kernel and modules with Xen guest support"
+  pkgdesc="The ${pkgbase/linux/Linux} kernel and modules"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
   depends=('coreutils' 'linux-libre-firmware' 'kmod' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
-  conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
-  replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
+  provides=( "${_replaces[@]/%/${_kernelname#-libre}=${pkgver}}")
+  conflicts=("${_replaces[@]/%/${_kernelname#-libre}}")
+  replaces=( "${_replaces[@]/%/${_kernelname#-libre}}")
   backup=("etc/mkinitcpio.d/${pkgbase}.preset")
-  install=${pkgbase}.install
+  install=linux.install
 
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
   KARCH=x86
 
@@ -105,7 +118,7 @@ _package() {
 
   mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
   make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install
-  cp arch/${KARCH}/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
+  cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
 
   # set correct depmod command for install
   cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
@@ -116,9 +129,9 @@ _package() {
     -i "${startdir}/${install}"
 
   # install mkinitcpio preset file for kernel
-  install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+  install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
   sed \
-    -e "1s|'linux*.*'|'${pkgbase}'|" \
+    -e "1s|'linux.*'|'${pkgbase}'|" \
     -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \
     -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \
     -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \
@@ -131,10 +144,10 @@ _package() {
   # gzip -9 all modules to save 100MB of space
   find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
   # make room for external modules
-  ln -s "../extramodules-${_basekernel}${_localversionname:--LIBRE-XEN}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
+  ln -s "../extramodules-${_basekernel}${_kernelname:--ARCH}" "${pkgdir}/lib/modules/${_kernver}/extramodules"
   # add real version for building modules and running depmod from post_install/upgrade
-  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-XEN}"
-  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-XEN}/version"
+  mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}"
+  echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_kernelname:--ARCH}/version"
 
   # Now we call depmod...
   depmod -b "${pkgdir}" -F System.map "${_kernver}"
@@ -148,14 +161,16 @@ _package() {
 }
 
 _package-headers() {
-  pkgdesc="Header files and scripts for building modules for ${pkgbase^} kernel"
-  provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}")
-  conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
-  replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers")
+  pkgdesc="Header files and scripts for building modules for ${pkgbase/linux/Linux} kernel"
+  provides=( "${_replaces[@]/%/${_kernelname#-libre}-headers=${pkgver}}")
+  conflicts=("${_replaces[@]/%/${_kernelname#-libre}-headers}")
+  replaces=( "${_replaces[@]/%/${_kernelname#-libre}-headers}")
+
+  KARCH=x86
 
   install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
 
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
   install -D -m644 Makefile \
     "${pkgdir}/usr/lib/modules/${_kernver}/build/Makefile"
   install -D -m644 kernel/Makefile \
@@ -178,12 +193,6 @@ _package-headers() {
   cp Module.symvers "${pkgdir}/usr/lib/modules/${_kernver}/build"
   cp -a scripts "${pkgdir}/usr/lib/modules/${_kernver}/build"
 
-  if [ "$CARCH" = "mips64el" ]; then
-    cp arch/${KARCH}/Kbuild "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-    cp -a arch/${KARCH}/loongson "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-    cp ${srcdir}/Kbuild.platforms "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-  fi
-
   # fix permissions on scripts dir
   chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts"
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions"
@@ -273,12 +282,12 @@ _package-headers() {
 }
 
 _package-docs() {
-  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase^} kernel"
-  provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}")
-  conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
-  replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs")
+  pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase/linux/Linux} kernel"
+  provides=( "${_replaces[@]/%/${_kernelname#-libre}-docs=${pkgver}}")
+  conflicts=("${_replaces[@]/%/${_kernelname#-libre}-docs}")
+  replaces=( "${_replaces[@]/%/${_kernelname#-libre}-docs}")
 
-  cd "${srcdir}/linux-${_basekernel}"
+  cd "${srcdir}/${_srcname}"
 
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build"
   cp -al Documentation "${pkgdir}/usr/lib/modules/${_kernver}/build"
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config
index 1488e83b3..5b57a0b7f 100644
--- a/kernels/linux-libre-xen/config
+++ b/kernels/linux-libre-xen/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.15.0-1 Kernel Configuration
+# Linux/x86 3.15.3-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -48,8 +48,8 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-LIBRE-XEN"
-CONFIG_LOCALVERSION_AUTO=y
+CONFIG_LOCALVERSION="-libre-xen"
+# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y
@@ -235,7 +235,6 @@ CONFIG_HAVE_OPTPROBES=y
 CONFIG_HAVE_KPROBES_ON_FTRACE=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
@@ -349,14 +348,13 @@ CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_HYPERVISOR_GUEST=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_PARAVIRT_SPINLOCKS is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
 CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=500
+CONFIG_XEN_MAX_DOMAIN_MEMORY=64
 CONFIG_XEN_SAVE_RESTORE=y
 # CONFIG_XEN_DEBUG_FS is not set
-CONFIG_XEN_PVH=y
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
 # CONFIG_LGUEST_GUEST is not set
@@ -406,6 +404,8 @@ CONFIG_CPU_SUP_TRANSMETA_32=y
 CONFIG_HPET_TIMER=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_DMI=y
+CONFIG_SWIOTLB=y
+CONFIG_IOMMU_HELPER=y
 CONFIG_NR_CPUS=8
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -431,13 +431,18 @@ CONFIG_MICROCODE=m
 # CONFIG_MICROCODE_INTEL is not set
 # CONFIG_MICROCODE_AMD is not set
 CONFIG_MICROCODE_OLD_INTERFACE=y
+# CONFIG_MICROCODE_INTEL_EARLY is not set
+# CONFIG_MICROCODE_AMD_EARLY is not set
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 # CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
+CONFIG_X86_PAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -455,10 +460,11 @@ CONFIG_MEMORY_ISOLATION=y
 # CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_BALLOON_COMPACTION=y
 CONFIG_COMPACTION=y
 CONFIG_MIGRATION=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
@@ -645,13 +651,11 @@ CONFIG_PCI=y
 # CONFIG_PCI_GOBIOS is not set
 # CONFIG_PCI_GOMMCONFIG is not set
 # CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOOLPC is not set
 CONFIG_PCI_GOANY=y
 CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_XEN=y
-CONFIG_PCI_OLPC=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_HOTPLUG_PCI_PCIE=y
@@ -668,7 +672,7 @@ CONFIG_PCI_MSI=y
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCI_REALLOC_ENABLE_AUTO=y
 CONFIG_PCI_STUB=m
-CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_XEN_PCIDEV_FRONTEND=y
 CONFIG_HT_IRQ=y
 CONFIG_PCI_ATS=y
 CONFIG_PCI_IOV=y
@@ -684,11 +688,6 @@ CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
 # CONFIG_SCx200 is not set
-CONFIG_OLPC=y
-CONFIG_OLPC_XO1_PM=y
-CONFIG_OLPC_XO1_RTC=y
-CONFIG_OLPC_XO1_SCI=y
-CONFIG_OLPC_XO15_SCI=y
 CONFIG_ALIX=y
 # CONFIG_NET5501 is not set
 # CONFIG_GEOS is not set
@@ -1529,7 +1528,6 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
 CONFIG_MTD_CMDLINE_PARTS=m
-CONFIG_MTD_OF_PARTS=m
 CONFIG_MTD_AR7_PARTS=m
 
 #
@@ -1578,7 +1576,6 @@ CONFIG_MTD_ABSENT=m
 #
 CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_PHYSMAP is not set
-CONFIG_MTD_PHYSMAP_OF=m
 CONFIG_MTD_SC520CDP=m
 CONFIG_MTD_NETSC520=m
 # CONFIG_MTD_SBC_GXX is not set
@@ -1649,21 +1646,6 @@ CONFIG_MTD_UBI_BEB_LIMIT=20
 # CONFIG_MTD_UBI_FASTMAP is not set
 # CONFIG_MTD_UBI_GLUEBI is not set
 # CONFIG_MTD_UBI_BLOCK is not set
-CONFIG_OF=y
-
-#
-# Device Tree and Open Firmware support
-#
-# CONFIG_OF_SELFTEST is not set
-CONFIG_OF_PROMTREE=y
-CONFIG_OF_ADDRESS=y
-CONFIG_OF_ADDRESS_PCI=y
-CONFIG_OF_IRQ=y
-CONFIG_OF_NET=y
-CONFIG_OF_MDIO=m
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
-CONFIG_OF_MTD=y
 CONFIG_PARPORT=m
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
 CONFIG_PARPORT_PC=m
@@ -1714,7 +1696,7 @@ CONFIG_CDROM_PKTCDVD=m
 CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
-CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_HD is not set
@@ -1938,7 +1920,6 @@ CONFIG_SCSI_PAS16=m
 CONFIG_SCSI_QLOGIC_FAS=m
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLA_FC=m
-CONFIG_TCM_QLA2XXX=m
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
@@ -2140,6 +2121,7 @@ CONFIG_FIREWIRE_NOSY=m
 CONFIG_I2O=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_CONFIG=m
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
@@ -2252,7 +2234,6 @@ CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NI65=m
 CONFIG_NET_VENDOR_ARC=y
-CONFIG_ARC_EMAC=m
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
 CONFIG_ATL1=m
@@ -2264,7 +2245,6 @@ CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
 CONFIG_B44_PCICORE_AUTOSELECT=y
 CONFIG_B44_PCI=y
-CONFIG_BCMGENET=m
 CONFIG_BNX2=m
 CONFIG_CNIC=m
 CONFIG_TIGON3=m
@@ -2469,9 +2449,6 @@ CONFIG_LSI_ET1011C_PHY=m
 CONFIG_MICREL_PHY=m
 CONFIG_MDIO_BITBANG=m
 # CONFIG_MDIO_GPIO is not set
-CONFIG_MDIO_BUS_MUX=m
-CONFIG_MDIO_BUS_MUX_GPIO=m
-CONFIG_MDIO_BUS_MUX_MMIOREG=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_PLIP=m
 CONFIG_PPP=m
@@ -2756,7 +2733,7 @@ CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IEEE802154_FAKELB=m
 CONFIG_IEEE802154_AT86RF230=m
 # CONFIG_IEEE802154_MRF24J40 is not set
-CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_BACKEND=m
 CONFIG_VMXNET3=m
 CONFIG_HYPERV_NET=m
@@ -2965,7 +2942,6 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_PS2_TOUCHKIT=y
-CONFIG_MOUSE_PS2_OLPC=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
@@ -3035,7 +3011,6 @@ CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
 CONFIG_TOUCHSCREEN_DYNAPRO=m
 CONFIG_TOUCHSCREEN_HAMPSHIRE=m
 CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_EGALAX=m
 CONFIG_TOUCHSCREEN_FUJITSU=m
 CONFIG_TOUCHSCREEN_ILI210X=m
 CONFIG_TOUCHSCREEN_GUNZE=m
@@ -3100,7 +3075,6 @@ CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
-CONFIG_INPUT_GPIO_BEEPER=m
 # CONFIG_INPUT_GPIO_TILT_POLLED is not set
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m
@@ -3123,7 +3097,7 @@ CONFIG_INPUT_ADXL34X_SPI=m
 # CONFIG_INPUT_IMS_PCU is not set
 CONFIG_INPUT_CMA3000=m
 CONFIG_INPUT_CMA3000_I2C=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
 
 #
@@ -3141,8 +3115,6 @@ CONFIG_SERIO_RAW=m
 CONFIG_SERIO_ALTERA_PS2=m
 CONFIG_SERIO_PS2MULT=m
 CONFIG_SERIO_ARC_PS2=m
-CONFIG_SERIO_APBPS2=m
-CONFIG_SERIO_OLPC_APSP=m
 CONFIG_HYPERV_KEYBOARD=m
 CONFIG_GAMEPORT=m
 CONFIG_GAMEPORT_NS558=m
@@ -3206,7 +3178,6 @@ CONFIG_SERIAL_MFD_HSU=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_OF_PLATFORM=m
 CONFIG_SERIAL_SCCNXP=m
 # CONFIG_SERIAL_TIMBERDALE is not set
 CONFIG_SERIAL_ALTERA_JTAGUART=m
@@ -3215,7 +3186,6 @@ CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
 CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
 # CONFIG_SERIAL_IFX6X60 is not set
 CONFIG_SERIAL_PCH_UART=m
-CONFIG_SERIAL_XILINX_PS_UART=m
 CONFIG_SERIAL_ARC=m
 CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
@@ -3225,6 +3195,7 @@ CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
 CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
 CONFIG_HVC_XEN_FRONTEND=y
 CONFIG_VIRTIO_CONSOLE=m
@@ -3276,7 +3247,7 @@ CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 CONFIG_TCG_ST33_I2C=m
-CONFIG_TCG_XEN=m
+# CONFIG_TCG_XEN is not set
 CONFIG_TELCLOCK=m
 CONFIG_DEVPORT=y
 CONFIG_I2C=m
@@ -3288,7 +3259,6 @@ CONFIG_I2C_MUX=m
 #
 # Multiplexer I2C Chip support
 #
-# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
 # CONFIG_I2C_MUX_GPIO is not set
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
@@ -3339,8 +3309,7 @@ CONFIG_I2C_EG20T=m
 # CONFIG_I2C_GPIO is not set
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
-CONFIG_I2C_PXA=m
-CONFIG_I2C_PXA_PCI=y
+# CONFIG_I2C_PXA_PCI is not set
 CONFIG_I2C_SIMTEC=m
 CONFIG_I2C_XILINX=m
 
@@ -3376,7 +3345,6 @@ CONFIG_SPI_BITBANG=m
 CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_GPIO=m
 CONFIG_SPI_LM70_LLP=m
-# CONFIG_SPI_FSL_SPI is not set
 CONFIG_SPI_OC_TINY=m
 CONFIG_SPI_PXA2XX_DMA=y
 CONFIG_SPI_PXA2XX=m
@@ -3432,13 +3400,9 @@ CONFIG_PINCTRL=y
 # CONFIG_PINCONF is not set
 # CONFIG_DEBUG_PINCTRL is not set
 # CONFIG_PINCTRL_BAYTRAIL is not set
-# CONFIG_PINCTRL_BCM281XX is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
-# CONFIG_PINCTRL_SINGLE is not set
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_DEVRES=y
-CONFIG_OF_GPIO=y
 CONFIG_GPIO_ACPI=y
 # CONFIG_DEBUG_GPIO is not set
 CONFIG_GPIO_SYSFS=y
@@ -3447,16 +3411,13 @@ CONFIG_GPIO_SYSFS=y
 # Memory mapped GPIO drivers:
 #
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
-# CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_F7188X is not set
 CONFIG_GPIO_SCH311X=m
-# CONFIG_GPIO_SYSCON is not set
 CONFIG_GPIO_SCH=m
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_VX855 is not set
 CONFIG_GPIO_LYNXPOINT=m
-# CONFIG_GPIO_GRGPIO is not set
 
 #
 # I2C GPIO expanders:
@@ -3468,26 +3429,22 @@ CONFIG_GPIO_LP3943=m
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_ADP5588 is not set
-# CONFIG_GPIO_ADNP is not set
 
 #
 # PCI GPIO expanders:
 #
-CONFIG_GPIO_CS5535=y
+CONFIG_GPIO_CS5535=m
 CONFIG_GPIO_AMD8111=m
 # CONFIG_GPIO_INTEL_MID is not set
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
-# CONFIG_GPIO_SODAVILLE is not set
 # CONFIG_GPIO_RDC321X is not set
 
 #
 # SPI GPIO expanders:
 #
 # CONFIG_GPIO_MAX7301 is not set
-# CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_74X164 is not set
 
 #
 # AC97 GPIO expanders:
@@ -3501,7 +3458,6 @@ CONFIG_GPIO_UCB1400=m
 #
 # MODULbus GPIO expanders:
 #
-# CONFIG_GPIO_BCM_KONA is not set
 
 #
 # USB GPIO expanders:
@@ -3515,7 +3471,6 @@ CONFIG_TEST_POWER=m
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
-CONFIG_BATTERY_OLPC=m
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_BATTERY_BQ27x00 is not set
 # CONFIG_BATTERY_MAX17040 is not set
@@ -3530,7 +3485,6 @@ CONFIG_BATTERY_OLPC=m
 CONFIG_CHARGER_BQ24735=m
 # CONFIG_CHARGER_SMB347 is not set
 CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_AVS=y
 CONFIG_HWMON=m
 CONFIG_HWMON_VID=m
@@ -3681,14 +3635,12 @@ CONFIG_SENSORS_W83627EHF=m
 CONFIG_SENSORS_ACPI_POWER=m
 CONFIG_SENSORS_ATK0110=m
 CONFIG_THERMAL=y
-CONFIG_THERMAL_OF=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
-# CONFIG_CPU_THERMAL is not set
 # CONFIG_THERMAL_EMULATION is not set
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_PKG_TEMP_THERMAL=m
@@ -3705,7 +3657,6 @@ CONFIG_WATCHDOG_CORE=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
-CONFIG_GPIO_WATCHDOG=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_RETU_WATCHDOG=m
@@ -3747,7 +3698,7 @@ CONFIG_W83977F_WDT=m
 CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
 CONFIG_MEN_A21_WDT=m
-CONFIG_XEN_WDT=m
+# CONFIG_XEN_WDT is not set
 
 #
 # ISA-based Watchdog Cards
@@ -3807,7 +3758,6 @@ CONFIG_MFD_CS5535=m
 CONFIG_MFD_BCM590XX=m
 CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_I2C=m
-CONFIG_MFD_CROS_EC_SPI=m
 # CONFIG_MFD_DA9052_SPI is not set
 CONFIG_MFD_MC13XXX=m
 # CONFIG_MFD_MC13XXX_SPI is not set
@@ -4536,13 +4486,13 @@ CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
 CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
+CONFIG_FB_SYS_FILLRECT=y
+CONFIG_FB_SYS_COPYAREA=y
+CONFIG_FB_SYS_IMAGEBLIT=y
 # CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_SYS_FOPS=y
 CONFIG_FB_DEFERRED_IO=y
-# CONFIG_FB_SVGALIB is not set
+CONFIG_FB_SVGALIB=m
 # CONFIG_FB_MACMODES is not set
 CONFIG_FB_BACKLIGHT=y
 CONFIG_FB_MODE_HELPERS=y
@@ -4598,7 +4548,7 @@ CONFIG_FB_VT8623=m
 CONFIG_FB_UDL=m
 # CONFIG_FB_GOLDFISH is not set
 CONFIG_FB_VIRTUAL=m
-CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_XEN_FBDEV_FRONTEND=y
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
@@ -4606,7 +4556,6 @@ CONFIG_XEN_FBDEV_FRONTEND=m
 CONFIG_FB_HYPERV=m
 # CONFIG_FB_SIMPLE is not set
 # CONFIG_EXYNOS_VIDEO is not set
-CONFIG_FB_SSD1307=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_L4F00242T03 is not set
@@ -5064,9 +5013,7 @@ CONFIG_USB_MUSB_HDRC=m
 # CONFIG_USB_MUSB_GADGET is not set
 CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_MUSB_UX500=m
-CONFIG_USB_MUSB_AM335X_CHILD=m
 # CONFIG_USB_UX500_DMA is not set
 CONFIG_MUSB_PIO_ONLY=y
 # CONFIG_USB_DWC3 is not set
@@ -5190,7 +5137,6 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
 #
 # USB Peripheral Controller
 #
-CONFIG_USB_FUSB300=m
 # CONFIG_USB_FOTG210_UDC is not set
 CONFIG_USB_GR_UDC=m
 CONFIG_USB_R8A66597=m
@@ -5271,7 +5217,6 @@ CONFIG_MMC_SDHCI_PCI=m
 CONFIG_MMC_RICOH_MMC=y
 CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_SDHCI_OF_ARASAN=m
 CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MMC_SDHCI_PXAV2=m
 CONFIG_MMC_WBSD=m
@@ -5422,7 +5367,6 @@ CONFIG_RTC_DRV_DS1307=m
 CONFIG_RTC_DRV_DS1374=m
 CONFIG_RTC_DRV_DS1672=m
 CONFIG_RTC_DRV_DS3232=m
-CONFIG_RTC_DRV_HYM8563=m
 CONFIG_RTC_DRV_MAX6900=m
 CONFIG_RTC_DRV_RS5C372=m
 CONFIG_RTC_DRV_ISL1208=m
@@ -5481,7 +5425,6 @@ CONFIG_RTC_DRV_PCF50633=m
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_MC13XXX=m
-CONFIG_RTC_DRV_SNVS=m
 # CONFIG_RTC_DRV_MOXART is not set
 
 #
@@ -5500,11 +5443,8 @@ CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_PCH_DMA=m
-CONFIG_FSL_EDMA=m
 CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_ACPI=y
-CONFIG_DMA_OF=y
 
 #
 # DMA Clients
@@ -5554,12 +5494,11 @@ CONFIG_HYPERV_BALLOON=m
 # Xen driver support
 #
 CONFIG_XEN_BALLOON=y
-# CONFIG_XEN_SELFBALLOONING is not set
-CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_SELFBALLOONING=y
 CONFIG_XEN_SCRUB_PAGES=y
-CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_DEV_EVTCHN=y
 CONFIG_XEN_BACKEND=y
-CONFIG_XENFS=m
+CONFIG_XENFS=y
 CONFIG_XEN_COMPAT_XENFS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_XENBUS_FRONTEND=y
@@ -5568,9 +5507,8 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_SWIOTLB_XEN=y
 CONFIG_XEN_TMEM=m
 CONFIG_XEN_PCIDEV_BACKEND=m
-CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_PRIVCMD=y
 CONFIG_XEN_ACPI_PROCESSOR=m
-# CONFIG_XEN_MCE_LOG is not set
 CONFIG_XEN_HAVE_PVMMU=y
 CONFIG_STAGING=y
 CONFIG_ET131X=m
@@ -5718,9 +5656,6 @@ CONFIG_COMEDI_DAS08=m
 CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_NI_LABPC_ISADMA=m
 CONFIG_COMEDI_NI_TIO=m
-CONFIG_FB_OLPC_DCON=m
-CONFIG_FB_OLPC_DCON_1=y
-CONFIG_FB_OLPC_DCON_1_5=y
 # CONFIG_PANEL is not set
 CONFIG_RTL8192U=m
 CONFIG_RTLLIB=m
@@ -5887,7 +5822,6 @@ CONFIG_TOSHIBA_BT_RFKILL=m
 CONFIG_ACPI_CMPC=m
 CONFIG_INTEL_IPS=m
 CONFIG_IBM_RTL=m
-CONFIG_XO1_RFKILL=m
 CONFIG_XO15_EBOOK=m
 CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
@@ -5908,8 +5842,6 @@ CONFIG_COMMON_CLK=y
 # Common Clock Framework
 #
 # CONFIG_COMMON_CLK_SI5351 is not set
-# CONFIG_COMMON_CLK_SI570 is not set
-# CONFIG_COMMON_CLK_QCOM is not set
 
 #
 # Hardware Spinlock drivers
@@ -5925,7 +5857,6 @@ CONFIG_CLKBLD_I8253=y
 # CONFIG_MAILBOX is not set
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_OF_IOMMU=y
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
@@ -5953,11 +5884,8 @@ CONFIG_MEMORY=y
 # CONFIG_VME_BUS is not set
 CONFIG_PWM=y
 CONFIG_PWM_SYSFS=y
-CONFIG_PWM_FSL_FTM=m
 # CONFIG_PWM_LP3943 is not set
 CONFIG_PWM_LPSS=m
-# CONFIG_PWM_PCA9685 is not set
-CONFIG_IRQCHIP=y
 CONFIG_IPACK_BUS=m
 CONFIG_BOARD_TPCI200=m
 CONFIG_SERIAL_IPOCTAL=m
@@ -6679,8 +6607,6 @@ CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
 CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
 CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
diff --git a/kernels/linux-libre-xen/linux-libre-xen.preset b/kernels/linux-libre-xen/linux-libre-xen.preset
deleted file mode 100644
index 6d5019d92..000000000
--- a/kernels/linux-libre-xen/linux-libre-xen.preset
+++ /dev/null
@@ -1,14 +0,0 @@
-# mkinitcpio preset file for the 'linux-libre-xen' package
-
-ALL_config="/etc/mkinitcpio.conf"
-ALL_kver="/boot/vmlinuz-linux-libre-xen"
-
-PRESETS=('default' 'fallback')
-
-#default_config="/etc/mkinitcpio.conf"
-default_image="/boot/initramfs-linux-libre-xen.img"
-#default_options=""
-
-#fallback_config="/etc/mkinitcpio.conf"
-fallback_image="/boot/initramfs-linux-libre-xen-fallback.img" 
-fallback_options="-S autodetect"
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux.install
index e8dc463b6..ef4241383 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux.install
@@ -1,17 +1,15 @@
 # arg 1:  the new package version
 # arg 2:  the old package version
 
-KERNEL_NAME=-xen
+KERNEL_NAME=
 KERNEL_VERSION=
 
 post_install () {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
+  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+  mkinitcpio -p linux${KERNEL_NAME}
 }
 
 post_upgrade() {
@@ -22,10 +20,8 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  if command -v mkinitcpio 2>&1 > /dev/null; then
-    echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
-    mkinitcpio -p linux-libre${KERNEL_NAME}
-  fi
+  echo ">>> Generating initial ramdisk, using mkinitcpio.  Please wait..."
+  mkinitcpio -p linux${KERNEL_NAME}
 
   if [ $(vercmp $2 3.13) -lt 0 ]; then
     echo ">>> WARNING: AT keyboard support is no longer built into the kernel."
@@ -36,6 +32,6 @@ post_upgrade() {
 
 post_remove() {
   # also remove the compat symlinks
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}.img
-  rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
+  rm -f boot/initramfs-linux${KERNEL_NAME}.img
+  rm -f boot/initramfs-linux${KERNEL_NAME}-fallback.img
 }
diff --git a/kernels/linux-libre-xen/linux.preset b/kernels/linux-libre-xen/linux.preset
new file mode 100644
index 000000000..b06292d10
--- /dev/null
+++ b/kernels/linux-libre-xen/linux.preset
@@ -0,0 +1,14 @@
+# mkinitcpio preset file for the 'linux' package
+
+ALL_config="/etc/mkinitcpio.conf"
+ALL_kver="/boot/vmlinuz-linux"
+
+PRESETS=('default' 'fallback')
+
+#default_config="/etc/mkinitcpio.conf"
+default_image="/boot/initramfs-linux.img"
+#default_options=""
+
+#fallback_config="/etc/mkinitcpio.conf"
+fallback_image="/boot/initramfs-linux-fallback.img" 
+fallback_options="-S autodetect"