summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-19 17:43:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-19 17:43:04 -0700
commit31583d6acf940d2951bc8716557b06d9de5a0c4b (patch)
tree607aef385b0998f0cb7ff63b05407afed5182840 /include
parentee37ba7a4212c7420f12e6a2ad8a3966649ede7a (diff)
parentf740f5ca056f0a4eff3abdf272a8a4ba3965d57d (diff)
downloadop-kernel-dev-31583d6acf940d2951bc8716557b06d9de5a0c4b.zip
op-kernel-dev-31583d6acf940d2951bc8716557b06d9de5a0c4b.tar.gz
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')
-rw-r--r--include/linux/kernel.h2
-rw-r--r--include/linux/types.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index c5a71c3..fac104e 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -58,7 +58,7 @@ extern const char linux_proc_banner[];
#define _RET_IP_ (unsigned long)__builtin_return_address(0)
#define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; })
-#ifdef CONFIG_LBD
+#ifdef CONFIG_LBDAF
# include <asm/div64.h>
# define sector_div(a, b) do_div(a, b)
#else
diff --git a/include/linux/types.h b/include/linux/types.h
index 5abe354..c42724f 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -131,7 +131,7 @@ typedef __s64 int64_t;
*
* blkcnt_t is the type of the inode's block count.
*/
-#ifdef CONFIG_LBD
+#ifdef CONFIG_LBDAF
typedef u64 sector_t;
typedef u64 blkcnt_t;
#else
OpenPOWER on IntegriCloud