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

2 files changed, 5 insertions, 7 deletions

diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index f65b3f369eb0..f9d01608cbe2 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -100,8 +100,6 @@ static DEFINE_SPINLOCK(hd_lock);
 static struct request_queue *hd_queue;
 static struct request *hd_req;
 
-#define MAJOR_NR HD_MAJOR
-
 #define TIMEOUT_VALUE   (6*HZ)
 #define HD_DELAY        0
 
@@ -712,12 +710,12 @@ static int __init hd_init(void)
 {
         int drive;
 
-        if (register_blkdev(MAJOR_NR, "hd"))
+        if (register_blkdev(HD_MAJOR, "hd"))
                 return -1;
 
         hd_queue = blk_init_queue(do_hd_request, &hd_lock);
         if (!hd_queue) {
-                unregister_blkdev(MAJOR_NR, "hd");
+                unregister_blkdev(HD_MAJOR, "hd");
                 return -ENOMEM;
         }
 
@@ -751,7 +749,7 @@ static int __init hd_init(void)
                 struct hd_i_struct *p = &hd_info[drive];
                 if (!disk)
                         goto Enomem;
-                disk->major = MAJOR_NR;
+                disk->major = HD_MAJOR;
                 disk->first_minor = drive << 6;
                 disk->fops = &hd_fops;
                 sprintf(disk->disk_name, "hd%c", 'a'+drive);
@@ -795,7 +793,7 @@ out1:
         NR_HD = 0;
 out:
         del_timer(&device_timer);
-        unregister_blkdev(MAJOR_NR, "hd");
+        unregister_blkdev(HD_MAJOR, "hd");
         blk_cleanup_queue(hd_queue);
         return -1;
 Enomem:
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 {
 /*
  * Funtions to manipulate consecutive chunks
  */
-#  if defined(CONFIG_LBD) || (BITS_PER_LONG == 64)
+#  if defined(CONFIG_LBDAF) || (BITS_PER_LONG == 64)
 #    define DM_CHUNK_CONSECUTIVE_BITS 8
 #    define DM_CHUNK_NUMBER_BITS 56