diff options
| author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-04-15 18:31:32 -0700 |
|---|---|---|
| committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-04-15 18:31:32 -0700 |
| commit | ffb3ebbe0c98853f03a79b95cfff0f525df7d1fe (patch) | |
| tree | 9879cb74f4d2f8ab4652b4277b7f66c212766ab0 /libre/kernel26-libre-lts/config.i686 | |
| parent | 833e63b6728e7fe38ea0e77303623efa6bdef48c (diff) | |
| parent | c931fbbe5ae1246b69e2c61452f7c3d7632d98c9 (diff) | |
Merge branch 'master' of vparabola:~/projects/abslibre
Conflicts:
.gitignore
Diffstat (limited to 'libre/kernel26-libre-lts/config.i686')
| -rw-r--r-- | libre/kernel26-libre-lts/config.i686 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libre/kernel26-libre-lts/config.i686 b/libre/kernel26-libre-lts/config.i686 index ada856765..d2bba6bee 100644 --- a/libre/kernel26-libre-lts/config.i686 +++ b/libre/kernel26-libre-lts/config.i686 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Tue Mar 15 11:13:21 2011 +# Fri Feb 18 17:22:19 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2371,7 +2371,7 @@ CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_DEVKMEM=y +# CONFIG_DEVKMEM is not set CONFIG_SERIAL_NONSTANDARD=y # CONFIG_COMPUTONE is not set CONFIG_ROCKETPORT=m |