---

yaml
---
r: 162353
b: refs/heads/master
c: 137cf5b
h: refs/heads/master
i:
  162351: f46f40c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 542385ee6da337529c1087dd3d8c7af3e4269602
+refs/heads/master: 137cf5b22f5fd38751265eae881749c311d27c75

trunk/drivers/staging/rar/rar_driver.c

@@ -74,7 +74,7 @@ static void __exit rar_exit_handler(void);
 /*
   function that is activated on the succesfull probe of the RAR device
 */
-static int __devinit rar_probe(struct pci_dev *pdev, struct pci_device_id *ent);
+static int __devinit rar_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
 
 static struct pci_device_id rar_pci_id_tbl[] = {
 	{ PCI_DEVICE(VENDOR_ID, DEVICE_ID) },
@@ -311,7 +311,7 @@ static int memrar_init_rar_params(struct pci_dev *pdev)
 	if(1) {
 	       size_t z;
 	       for (z = 0; z != MRST_NUM_RAR; ++z) {
-			printk(KERN_WARNING "rar - BRAR[%u] physical address low\n"
+			printk(KERN_WARNING "rar - BRAR[%Zd] physical address low\n"
 			     "\tlow:  0x%08x\n"
 			     "\thigh: 0x%08x\n",
 			     z,
@@ -327,7 +327,7 @@ static int memrar_init_rar_params(struct pci_dev *pdev)
 /*
   function that is activaed on the succesfull probe of the RAR device
 */
-static int __devinit rar_probe(struct pci_dev *pdev, struct pci_device_id *ent)
+static int __devinit rar_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	/* error */
 	int error;

trunk/drivers/staging/sep/sep_ext_with_pci_driver.c

@@ -217,7 +217,7 @@ int sep_copy_cache_resident_to_area(unsigned long   src_cache_addr,
 	  "SEP Driver:cache data loc is %p\n",
 	  (void *)fw->data);
 	DEBUG_PRINT_1(SEP_DEBUG_LEVEL_EXTENDED,
-	  "SEP Driver:cache data size is %08x\n",
+	  "SEP Driver:cache data size is %08Zx\n",
 	  fw->size);
 
 	memcpy((void *)cache_virtual_address, (void *)fw->data, fw->size);
@@ -243,7 +243,7 @@ int sep_copy_cache_resident_to_area(unsigned long   src_cache_addr,
 	  "SEP Driver:res data loc is %p\n",
 	  (void *)fw->data);
 	DEBUG_PRINT_1(SEP_DEBUG_LEVEL_EXTENDED,
-	  "SEP Driver:res data size is %08x\n",
+	  "SEP Driver:res data size is %08Zx\n",
 	  fw->size);
 
 	memcpy((void *)resident_virtual_address, (void *)fw->data, fw->size);