about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-07-11 14:30:29 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-07-11 15:05:21 +0200
commitecc26d7a40747204ec0be45c6e051bfef605333c (patch)
tree82421bffb9b7796cd0b3c48806d7f40e05911697
parent7b9c493d6020d29b2229fffad35acf99c3b47a61 (diff)
downloadnixlib-ecc26d7a40747204ec0be45c6e051bfef605333c.tar
nixlib-ecc26d7a40747204ec0be45c6e051bfef605333c.tar.gz
nixlib-ecc26d7a40747204ec0be45c6e051bfef605333c.tar.bz2
nixlib-ecc26d7a40747204ec0be45c6e051bfef605333c.tar.lz
nixlib-ecc26d7a40747204ec0be45c6e051bfef605333c.tar.xz
nixlib-ecc26d7a40747204ec0be45c6e051bfef605333c.tar.zst
nixlib-ecc26d7a40747204ec0be45c6e051bfef605333c.zip
linux: Disable the old IDE subsystem
This has long been deprecated in favour of the new ATA support
(CONFIG_ATA).
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 37da42f8c0d6..cac102351b35 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -10,7 +10,7 @@
     `versionAtLeast`.
 
   Then do test your change by building all the kernels (or at least
-  their configs) in nixpkgs or else you will guarantee lots and lots
+  their configs) in Nixpkgs or else you will guarantee lots and lots
   of pain to users trying to switch to an older kernel because of some
   hardware problems with a new one.
 
@@ -294,8 +294,6 @@ with stdenv.lib;
   ${optionalString (versionOlder version "4.4") ''
     B43_PCMCIA? y
   ''}
-  BLK_DEV_CMD640_ENHANCED y # CMD640 enhanced support
-  BLK_DEV_IDEACPI y # IDE ACPI support
   BLK_DEV_INTEGRITY y
   BSD_PROCESS_ACCT_V3 y
   BT_HCIUART_BCSP? y
@@ -309,7 +307,7 @@ with stdenv.lib;
   FHANDLE y # used by systemd
   FRONTSWAP y
   FUSION y # Fusion MPT device support
-  IDE_GD_ATAPI y # ATAPI floppy support
+  IDE n # deprecated IDE support
   ${optionalString (versionAtLeast version "4.3") ''
     IDLE_PAGE_TRACKING y
   ''}
@@ -321,7 +319,6 @@ with stdenv.lib;
   KEXEC_FILE y
   KEXEC_JUMP y
   LDM_PARTITION y # Windows Logical Disk Manager (Dynamic Disk) support
-  LEDS_TRIGGER_IDE_DISK y # LED IDE Disk Trigger
   LOGIRUMBLEPAD2_FF y # Logitech Rumblepad 2 force feedback
   LOGO n # not needed
   MEDIA_ATTACH y