diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-10 01:23:33 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-10 01:23:33 +0000 |
| commit | eaa21da4ea94937a1bc2157c042a233d524d17ce (patch) | |
| tree | 1a63396a8da0cb4b1f2a4a438d5517db94ddb70d /libdde_linux26/include/linux | |
| parent | 7f0c9d3f773154e1c068983c2b19cd2e755326c3 (diff) | |
| parent | e1b0e34210b385d05e50900486262709a9ee3a31 (diff) | |
Merge branch 'dde-upstream' into dde
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 |