diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-08 03:37:51 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-08 03:37:51 (GMT) |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /arch/um/defconfig | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
| download | linux-fsl-qoriq-02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1.tar.xz | |
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/um/defconfig')
| -rw-r--r-- | arch/um/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/defconfig b/arch/um/defconfig index 780cc0a..f938fa8 100644 --- a/arch/um/defconfig +++ b/arch/um/defconfig @@ -41,6 +41,7 @@ CONFIG_M686=y # CONFIG_MGEODE_LX is not set # CONFIG_MCYRIXIII is not set # CONFIG_MVIAC3_2 is not set +# CONFIG_MVIAC7 is not set # CONFIG_X86_GENERIC is not set CONFIG_X86_CMPXCHG=y CONFIG_X86_XADD=y |