diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-28 09:49:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-28 09:49:56 -0700 |
| commit | fb8b00675eb6462aacab56bca31ed6107bda5314 (patch) | |
| tree | cd3c081dca9ea37d2ddc5e13b55fb4baeccf5452 /arch/microblaze/Kconfig | |
| parent | b48b2c3e50433ff6f7e46186daa7f986bd960215 (diff) | |
| parent | d5c15f17844b8883bc13b61a8ae114f0d3d59cdd (diff) | |
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze changes from Michal Simek.
* 'next' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Setup correct pointer to TLS area
microblaze: Add TLS support to sys_clone
microblaze: ftrace: Pass the first calling instruction for dynamic ftrace
microblaze: Port OOM changes to do_page_fault
microblaze: Do not select GENERIC_GPIO by default
Diffstat (limited to 'arch/microblaze/Kconfig')
| -rw-r--r-- | arch/microblaze/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig index 83460468998d..0bf44231aaf9 100644 --- a/arch/microblaze/Kconfig +++ b/arch/microblaze/Kconfig @@ -52,7 +52,7 @@ config GENERIC_CALIBRATE_DELAY def_bool y config GENERIC_GPIO - def_bool y + bool config GENERIC_CSUM def_bool y |