diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-08-09 05:36:44 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-08-09 05:36:44 -0400 |
| commit | 2144381da478cc4aa3a29ee29b0c5e6ddaaced14 (patch) | |
| tree | 380a29fec86b537ed602d12f4050654b1c66c27c /lib/Kconfig | |
| parent | 45d7f32c7a43cbb9592886d38190e379e2eb2226 (diff) | |
| parent | e5d84970a554d5c0072043a7b9f0f5b88b5fdfe1 (diff) | |
Merge branch 'async' of macbook:git/btrfs-unstable
Conflicts:
drivers/md/Makefile
lib/raid6/unroll.pl
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index 5b916bc0fbae..fa9bf2c06199 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -7,6 +7,9 @@ config BINARY_PRINTF | |||
| 7 | 7 | ||
| 8 | menu "Library routines" | 8 | menu "Library routines" |
| 9 | 9 | ||
| 10 | config RAID6_PQ | ||
| 11 | tristate | ||
| 12 | |||
| 10 | config BITREVERSE | 13 | config BITREVERSE |
| 11 | tristate | 14 | tristate |
| 12 | 15 | ||