diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2009-06-12 03:53:47 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2009-06-12 05:32:58 -0400 |
| commit | 5b02ee3d219f9e01b6e9146e25613822cfc2e5ce (patch) | |
| tree | 7ce9126738c3cf4b37d67170d0e4b34818c057a9 /lib/Kconfig | |
| parent | 26a28fa4fea5b8c65713aa50c124f76a88c7924d (diff) | |
| parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 (diff) | |
asm-generic: merge branch 'master' of torvalds/linux-2.6
Fixes a merge conflict against the x86 tree caused by a fix to
atomic.h which I renamed to atomic_long.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 8ade0a7a91e0..9960be04cbbe 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
| @@ -10,6 +10,9 @@ menu "Library routines" | |||
| 10 | config BITREVERSE | 10 | config BITREVERSE |
| 11 | tristate | 11 | tristate |
| 12 | 12 | ||
| 13 | config RATIONAL | ||
| 14 | boolean | ||
| 15 | |||
| 13 | config GENERIC_FIND_FIRST_BIT | 16 | config GENERIC_FIND_FIRST_BIT |
| 14 | bool | 17 | bool |
| 15 | 18 | ||