diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-02 10:17:37 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-02 10:17:37 +0100 |
| commit | ebfec135472b53e63f0542048f966fe6f6c5e2f9 (patch) | |
| tree | 13474bddc294aadb74c62ae1fcfdb11f564ae831 /libre/linux-libre-lts/config.i686 | |
| parent | 1604884117f74aa37ac283f72a3c57cf5473f7ed (diff) | |
| parent | 2f5224819ae83de6e9d8de008d5f2dc24769cb0d (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/libchewing/PKGBUILD
extra/ntfs-3g_ntfsprogs/PKGBUILD
extra/scim-chewing/PKGBUILD
Diffstat (limited to 'libre/linux-libre-lts/config.i686')
| -rw-r--r-- | libre/linux-libre-lts/config.i686 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686 index 8bf312df5..f903b2114 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -4920,7 +4920,7 @@ CONFIG_CLKSRC_I8253=y CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y -CONFIG_EFI_VARS=m +CONFIG_EFI_VARS=y CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y |