diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /lib/Kconfig | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'lib/Kconfig')
| -rw-r--r-- | lib/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index c7ad7a5b3535..85cf7ea978aa 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -8,10 +8,10 @@ config BITREVERSE | |||
| 8 | tristate | 8 | tristate |
| 9 | 9 | ||
| 10 | config GENERIC_FIND_FIRST_BIT | 10 | config GENERIC_FIND_FIRST_BIT |
| 11 | def_bool n | 11 | bool |
| 12 | 12 | ||
| 13 | config GENERIC_FIND_NEXT_BIT | 13 | config GENERIC_FIND_NEXT_BIT |
| 14 | def_bool n | 14 | bool |
| 15 | 15 | ||
| 16 | config CRC_CCITT | 16 | config CRC_CCITT |
| 17 | tristate "CRC-CCITT functions" | 17 | tristate "CRC-CCITT functions" |