diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-10 01:34:38 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-10 01:34:38 +0000 |
| commit | 8b64e1a29c4a9f41bc6c4e43fbdd3e61e707bbc0 (patch) | |
| tree | 3e64c5e44182f76aad0a1f60b7101392124a245b /libdde_linux26/include/linux | |
| parent | 27c2a777ec937d88b1afbb8cb499839dc8e97cf7 (diff) | |
| parent | 26221ccfc107472e3be0de79817efcd296d052a3 (diff) | |
Merge branch 'dde-clean' into upstream-merged
Diffstat (limited to 'libdde_linux26/include/linux')
| -rw-r--r-- | libdde_linux26/include/linux/autoconf.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libdde_linux26/include/linux/autoconf.h b/libdde_linux26/include/linux/autoconf.h index cf45b2bf..908b8dad 100644 --- a/libdde_linux26/include/linux/autoconf.h +++ b/libdde_linux26/include/linux/autoconf.h @@ -94,3 +94,5 @@ #undef CONFIG_BLK_DEV_IO_TRACE #undef CONFIG_FW_LOADER +#undef CONFIG_DMI +#undef CONFIG_PCIEAER |