diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-10 01:36:36 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-10 01:36:36 +0000 |
| commit | 2337c6841d00aac71f100549a08713786cd696d9 (patch) | |
| tree | 05b799a90dc1c5537bac6478fd2cdea0cfe68728 /libdde_linux26/include/linux/autoconf.h | |
| parent | 420ec9a9aa2fd36e4bbb67b3ee6c8471c37efa24 (diff) | |
| parent | 7e3b6178f20258f60cc9e9a7671287e4e02ffb76 (diff) | |
Merge branch 'upstream-merged'
Diffstat (limited to 'libdde_linux26/include/linux/autoconf.h')
| -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 |