diff --git a/[refs] b/[refs]
index 526b2f3dd31a..848be6d87384 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e8543618757ef2cb31a677a131027261a9b7251
+refs/heads/master: 5cf51e8aadfc81b9cec827565a6eaa4a0ad8dd5b
diff --git a/trunk/drivers/staging/et131x/et131x.h b/trunk/drivers/staging/et131x/et131x.h
index 050eb773f50f..fa42d94d4081 100644
--- a/trunk/drivers/staging/et131x/et131x.h
+++ b/trunk/drivers/staging/et131x/et131x.h
@@ -49,10 +49,10 @@
  */
 
 /* et131x_eeprom.c */
-int et131x_init_eeprom(struct et131x_adapter *etdev);
+int et131x_init_eeprom(struct et131x_adapter *adapter);
 
 /* et131x_initpci.c */
-void et131x_config_global_regs(struct et131x_adapter *pAdapter);
+void et131x_configure_global_regs(struct et131x_adapter *adapter);
 void et131x_enable_interrupts(struct et131x_adapter *adapter);
 void et131x_disable_interrupts(struct et131x_adapter *adapter);
 void et131x_align_allocated_memory(struct et131x_adapter *adapter,