diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-12 07:41:41 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-05-12 07:41:41 +0200 |
| commit | 363f9b90ebfbd8cb4811186724d7893148b5b6cf (patch) | |
| tree | 10d2791b1fe9dcff7db74af776ed885da868c3e5 /config-x86-generic | |
| parent | ccdb537b771c9772831cb7bc381764eed4ca2369 (diff) | |
| parent | 399e5b04d1141ca4db56714a45511868de141cd2 (diff) | |
| download | kernel-4.5.4-200.vanilla.knurd.1.fc24.tar.gz kernel-4.5.4-200.vanilla.knurd.1.fc24.tar.xz kernel-4.5.4-200.vanilla.knurd.1.fc24.zip | |
Merge remote-tracking branch 'origin/f23' into f23-user-thl-vanilla-fedorakernel-4.5.4-200.vanilla.knurd.1.fc24kernel-4.5.4-200.vanilla.knurd.1.fc23kernel-4.5.4-200.vanilla.knurd.1.fc22
Diffstat (limited to 'config-x86-generic')
| -rw-r--r-- | config-x86-generic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config-x86-generic b/config-x86-generic index 47060b9de..ea3d44975 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -319,8 +319,8 @@ CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m CONFIG_XEN_SELFBALLOONING=y CONFIG_XEN_PCIDEV_BACKEND=m CONFIG_XEN_ACPI_PROCESSOR=m -# CONFIG_XEN_SCSI_FRONTEND is not set -# CONFIG_XEN_SCSI_BACKEND is not set +CONFIG_XEN_SCSI_FRONTEND=m +CONFIG_XEN_SCSI_BACKEND=m CONFIG_XEN_SYMS=y CONFIG_SPI=y |