diff options
| author | Tejun Heo <tj@kernel.org> | 2010-04-04 22:37:28 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-04-04 22:37:28 -0400 |
| commit | 336f5899d287f06d8329e208fc14ce50f7ec9698 (patch) | |
| tree | 9b762d450d5eb248a6ff8317badb7e223d93ed58 /arch/microblaze/Kconfig | |
| parent | a4ab2773205e8b94c18625455f85e3b6bb9d7ad6 (diff) | |
| parent | db217dece3003df0841bacf9556b5c06aa097dae (diff) | |
Merge branch 'master' into export-slabh
Diffstat (limited to 'arch/microblaze/Kconfig')
| -rw-r--r-- | arch/microblaze/Kconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 203ec61c6d4c..76818f926539 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig | |||
| @@ -75,9 +75,6 @@ config LOCKDEP_SUPPORT | |||
| 75 | config HAVE_LATENCYTOP_SUPPORT | 75 | config HAVE_LATENCYTOP_SUPPORT |
| 76 | def_bool y | 76 | def_bool y |
| 77 | 77 | ||
| 78 | config PCI | ||
| 79 | def_bool n | ||
| 80 | |||
| 81 | config DTC | 78 | config DTC |
| 82 | def_bool y | 79 | def_bool y |
| 83 | 80 | ||