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 /drivers/md | |
| 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 'drivers/md')
| -rw-r--r-- | drivers/md/dm-exception-store.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-exception-store.h b/drivers/md/dm-exception-store.h index 0a2e6e7f67b3..c92701dc5001 100644 --- a/drivers/md/dm-exception-store.h +++ b/drivers/md/dm-exception-store.h | |||
| @@ -111,7 +111,7 @@ struct dm_exception_store { | |||
| 111 | /* | 111 | /* |
| 112 | * Funtions to manipulate consecutive chunks | 112 | * Funtions to manipulate consecutive chunks |
| 113 | */ | 113 | */ |
| 114 | # if defined(CONFIG_LBD) || (BITS_PER_LONG == 64) | 114 | # if defined(CONFIG_LBDAF) || (BITS_PER_LONG == 64) |
| 115 | # define DM_CHUNK_CONSECUTIVE_BITS 8 | 115 | # define DM_CHUNK_CONSECUTIVE_BITS 8 |
| 116 | # define DM_CHUNK_NUMBER_BITS 56 | 116 | # define DM_CHUNK_NUMBER_BITS 56 |
| 117 | 117 | ||