diff --git a/[refs] b/[refs]
index 163d397928df..7522c341e7a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4d62861b5cdb0ecfcae448e4281623284de5d05
+refs/heads/master: 165c0f39390212d7a517b80c3bb61cb8f1782fef
diff --git a/trunk/drivers/usb/host/isp116x-hcd.c b/trunk/drivers/usb/host/isp116x-hcd.c
index 96aaee509929..a3e881c60026 100644
--- a/trunk/drivers/usb/host/isp116x-hcd.c
+++ b/trunk/drivers/usb/host/isp116x-hcd.c
@@ -1581,11 +1581,10 @@ static int isp116x_start(struct usb_hcd *hcd)
 
 	/* ----- Root hub conf */
 	val = (25 << 24) & RH_A_POTPGT;
-	/* AN10003_1.pdf recommends NPS to be always 1 */
-	if (board->no_power_switching)
-		val |= RH_A_NPS;
-	if (board->power_switching_mode)
-		val |= RH_A_PSM;
+	/* AN10003_1.pdf recommends RH_A_NPS (no power switching) to
+	   be always set. Yet, instead, we request individual port
+	   power switching. */
+	val |= RH_A_PSM;
 	isp116x_write_reg32(isp116x, HCRHDESCA, val);
 	isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA);
 
diff --git a/trunk/include/linux/usb_isp116x.h b/trunk/include/linux/usb_isp116x.h
index 0d21407ccfc2..c028d724be94 100644
--- a/trunk/include/linux/usb_isp116x.h
+++ b/trunk/include/linux/usb_isp116x.h
@@ -19,11 +19,6 @@ struct isp116x_platform_data {
 	   prevents stopping internal clock, increasing
 	   thereby power consumption in suspended state. */
 	unsigned remote_wakeup_enable:1;
-	/* Switch or not to switch (keep always powered) */
-	unsigned no_power_switching:1;
-	/* Ganged port power switching (0) or individual port
-	   power switching (1) */
-	unsigned power_switching_mode:1;
 	/* Hardware reset set/clear. If implemented, this function must:
 	   if set == 0,   deassert chip's HW reset pin
 	   otherwise,     assert chip's HW reset pin       */