diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-07 12:36:05 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-07 12:36:05 +0100 |
| commit | a56d1a610bd4032e2eae610289333ad112fc5ba1 (patch) | |
| tree | 5fa9f42a339b57ef35616c01ac67c1c55c84fc7b /kernels/linux-libre-pae/config | |
| parent | 9437cdbc03cb103235fa0b043f4cf73882f10f34 (diff) | |
| parent | 8e5a0a990a12a59cadb687cae22a1960fce1660b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/augeas/PKGBUILD
community/midori/PKGBUILD
community/ruby-gtk2/PKGBUILD
extra/strigi/PKGBUILD
libre/abiword-libre/PKGBUILD
libre/abiword-libre/abiword-2.8.6-glib-2.31.patch
Diffstat (limited to 'kernels/linux-libre-pae/config')
| -rw-r--r-- | kernels/linux-libre-pae/config | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config index 02e820a41..fff8a9465 100644 --- a/kernels/linux-libre-pae/config +++ b/kernels/linux-libre-pae/config @@ -324,6 +324,7 @@ CONFIG_X86_32_IRIS=m CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y CONFIG_PARAVIRT_TIME_ACCOUNTING=y +# CONFIG_XEN is not set # CONFIG_XEN_PRIVILEGED_GUEST is not set CONFIG_KVM_GUEST=y CONFIG_LGUEST_GUEST=y @@ -1983,6 +1984,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 is not set CONFIG_I2O_CONFIG=m CONFIG_I2O_CONFIG_OLD_IOCTL=y CONFIG_I2O_BUS=m @@ -5516,7 +5518,7 @@ CONFIG_NFS_V4_1=y CONFIG_PNFS_FILE_LAYOUT=m CONFIG_PNFS_BLOCK=m CONFIG_PNFS_OBJLAYOUT=m -CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y |