diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-31 14:43:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-31 14:43:42 -0700 |
| commit | 9f58c62fcc66f06aee141fdd80d15213b7f4809a (patch) | |
| tree | d794c0c65f662b8fdab41e3586b968666463bbbe /arch/microblaze/Kconfig | |
| parent | 19e0d5f16ad9759d92f5739b53acdebfe22fa2a2 (diff) | |
| parent | a4f174dee4ae842e07cab7eeec194a3e60925c8d (diff) | |
Merge tag 'microblaze-3.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze
Pull Microblaze updates from Michal Simek:
- wire-up new bpf syscall
- fix PCI bug
- fix Kconfig warning
* tag 'microblaze-3.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Wire up bpf syscall
microblaze: Fix IO space breakage after of_pci_range_to_resource() change
microblaze: Fix missing NR_CPUS in menuconfig
Diffstat (limited to 'arch/microblaze/Kconfig')
| -rw-r--r-- | arch/microblaze/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 6feded3b0c4c..a7736fa0580c 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -129,6 +129,10 @@ endmenu menu "Kernel features" +config NR_CPUS + int + default "1" + config ADVANCED_OPTIONS bool "Prompt for advanced kernel configuration options" help |