Merge tag 'nfs-rdma-for-4.0-3' of git://git.linux-nfs.org/projects/anna/nfs-rdma

[mirror_ubuntu-zesty-kernel.git] / scripts / diffconfig

diff --git a/scripts/diffconfig b/scripts/diffconfig
index 6d672836e18722c38cce43149587db32882e6316..0db267d0adc9231de508b4cf9ca7068df8362384 100755 (executable)
--- a/scripts/diffconfig
+++ b/scripts/diffconfig
@@ -28,7 +28,6 @@ If no config files are specified, .config and .config.old are used.
 Example usage:
  $ diffconfig .config config-with-some-changes
 -EXT2_FS_XATTR  n
--EXT2_FS_XIP  n
  CRAMFS  n -> y
  EXT2_FS  y -> n
  LOG_BUF_SHIFT  14 -> 16