Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6

2 files changed, 8 insertions, 6 deletions

diff --git a/Documentation/aoe/mkshelf.sh b/Documentation/aoe/mkshelf.sh
index 8bacf9f2c7cc..32615814271c 100644
--- a/Documentation/aoe/mkshelf.sh
+++ b/Documentation/aoe/mkshelf.sh
@@ -8,13 +8,15 @@ fi
 n_partitions=${n_partitions:-16}
 dir=$1
 shelf=$2
+nslots=16
+maxslot=`echo $nslots 1 - p | dc`
 MAJOR=152
 
 set -e
 
-minor=`echo 10 \* $shelf \* $n_partitions | bc`
+minor=`echo $nslots \* $shelf \* $n_partitions | bc`
 endp=`echo $n_partitions - 1 | bc`
-for slot in `seq 0 9`; do
+for slot in `seq 0 $maxslot`; do
         for part in `seq 0 $endp`; do
                 name=e$shelf.$slot
                 test "$part" != "0" && name=${name}p$part
diff --git a/Documentation/firmware_class/firmware_sample_driver.c b/Documentation/firmware_class/firmware_sample_driver.c
index e1c56a7e6583..4bef8c25172c 100644
--- a/Documentation/firmware_class/firmware_sample_driver.c
+++ b/Documentation/firmware_class/firmware_sample_driver.c
@@ -32,14 +32,14 @@ static void sample_firmware_load(char *firmware, int size)
         u8 buf[size+1];
         memcpy(buf, firmware, size);
         buf[size] = '\0';
-        printk("firmware_sample_driver: firmware: %s\n", buf);
+        printk(KERN_INFO "firmware_sample_driver: firmware: %s\n", buf);
 }
 
 static void sample_probe_default(void)
 {
         /* uses the default method to get the firmware */
         const struct firmware *fw_entry;
-        printk("firmware_sample_driver: a ghost device got inserted :)\n");
+        printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
 
         if(request_firmware(&fw_entry, "sample_driver_fw", &ghost_device)!=0)
         {
@@ -61,7 +61,7 @@ static void sample_probe_specific(void)
 
         /* NOTE: This currently doesn't work */
 
-        printk("firmware_sample_driver: a ghost device got inserted :)\n");
+        printk(KERN_INFO "firmware_sample_driver: a ghost device got inserted :)\n");
 
         if(request_firmware(NULL, "sample_driver_fw", &ghost_device)!=0)
         {
@@ -83,7 +83,7 @@ static void sample_probe_async_cont(const struct firmware *fw, void *context)
                 return;
         }
 
-        printk("firmware_sample_driver: device pointer \"%s\"\n",
+        printk(KERN_INFO "firmware_sample_driver: device pointer \"%s\"\n",
                (char *)context);
         sample_firmware_load(fw->data, fw->size);
 }