diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 20:43:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 20:43:04 -0400 |
| commit | 31583d6acf940d2951bc8716557b06d9de5a0c4b (patch) | |
| tree | 607aef385b0998f0cb7ff63b05407afed5182840 /include/linux/kernel.h | |
| parent | ee37ba7a4212c7420f12e6a2ad8a3966649ede7a (diff) | |
| parent | f740f5ca056f0a4eff3abdf272a8a4ba3965d57d (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Fix kernel-doc parameter name typo in blk-settings.c:
block: rename CONFIG_LBD to CONFIG_LBDAF
block: Fix bounce_pfn setting
hd: stop defining MAJOR_NR
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index c5a71c38a95f..fac104e7186a 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -58,7 +58,7 @@ extern const char linux_proc_banner[]; | |||
| 58 | #define _RET_IP_ (unsigned long)__builtin_return_address(0) | 58 | #define _RET_IP_ (unsigned long)__builtin_return_address(0) |
| 59 | #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) | 59 | #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) |
| 60 | 60 | ||
| 61 | #ifdef CONFIG_LBD | 61 | #ifdef CONFIG_LBDAF |
| 62 | # include <asm/div64.h> | 62 | # include <asm/div64.h> |
| 63 | # define sector_div(a, b) do_div(a, b) | 63 | # define sector_div(a, b) do_div(a, b) |
| 64 | #else | 64 | #else |