summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMatt Housh <jaeger@crux.nu>2014-05-13 10:57:40 -0500
committerMatt Housh <jaeger@crux.nu>2014-05-13 10:57:40 -0500
commitfd49c35700c0073cf4754122a63cb5b1d1f25720 (patch)
tree4946e7b913107a550ce5ff3fe96f3eb0e30d2827 /kernel
parent5c2af4444b17e123c21246e0973605a1975ba384 (diff)
downloadiso-fd49c35700c0073cf4754122a63cb5b1d1f25720.tar.gz
iso-fd49c35700c0073cf4754122a63cb5b1d1f25720.tar.xz
Updated kernel, added dri3proto to setup-helper, updated MOTD version
Diffstat (limited to 'kernel')
-rwxr-xr-xkernel/checkdefconfig2
-rw-r--r--kernel/linux-3.12.19.config (renamed from kernel/linux-3.12.17.config)2
-rw-r--r--kernel/linux-3.12.19.defconfig (renamed from kernel/linux-3.12.17.defconfig)4
3 files changed, 4 insertions, 4 deletions
diff --git a/kernel/checkdefconfig b/kernel/checkdefconfig
index ba674b8..a301d3c 100755
--- a/kernel/checkdefconfig
+++ b/kernel/checkdefconfig
@@ -1,7 +1,7 @@
#!/bin/bash
KV=$(grep ^KERNEL_VERSION ../Makefile | awk '{ print $3 }')
-OPT=(DEVTMPFS DEVTMPFS_MOUNT EXT2_FS EXT3_FS EXT4_FS XFS_FS REISERFS_FS JFS_FS BTRFS_FS BLK_DEV_SD HYPERV_STORAGE SCSI_VIRTIO VMWARE_PVSCSI SATA_AHCI ATA_PIIX SATA_NV PATA_AMD PATA_JMICRON IA32_EMULATION)
+OPT=(DEVTMPFS DEVTMPFS_MOUNT EXT2_FS EXT3_FS EXT4_FS XFS_FS REISERFS_FS JFS_FS BTRFS_FS BLK_DEV_SD HYPERV_STORAGE SCSI_VIRTIO VIRTIO_BLK VMWARE_PVSCSI SATA_AHCI ATA_PIIX SATA_NV PATA_AMD PATA_JMICRON IA32_EMULATION)
if [ ! -f linux-${KV}.defconfig ]; then
echo "Can't find 'linux-${KV}.defconfig'!"
diff --git a/kernel/linux-3.12.17.config b/kernel/linux-3.12.19.config
index cad628c..7dd70e4 100644
--- a/kernel/linux-3.12.17.config
+++ b/kernel/linux-3.12.19.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.17 Kernel Configuration
+# Linux/x86 3.12.19 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
diff --git a/kernel/linux-3.12.17.defconfig b/kernel/linux-3.12.19.defconfig
index 424db00..10bf008 100644
--- a/kernel/linux-3.12.17.defconfig
+++ b/kernel/linux-3.12.19.defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.17 Kernel Configuration
+# Linux/x86 3.12.19 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -725,7 +725,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
# CONFIG_ATA_OVER_ETH is not set
CONFIG_XEN_BLKDEV_FRONTEND=y
# CONFIG_XEN_BLKDEV_BACKEND is not set
-CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_BLK=y
# CONFIG_BLK_DEV_HD is not set
# CONFIG_BLK_DEV_RBD is not set
# CONFIG_BLK_DEV_RSXX is not set

Generated by cgit