---

yaml --- r: 325484 b: refs/heads/master c: f45c69b h: refs/heads/master v: v3
git-mirror · Sep 18, 2012 · 3b753e5 · 3b753e5
1 parent bbdd424
commit 3b753e5
Show file tree

Hide file tree

Showing 59 changed files with 2,414 additions and 7,208 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9970eeae4854e0eee03e5e467ace4ec7cbf36d1f
+refs/heads/master: f45c69b1136078bb35ee0f1cb89ae92fd9bc5cd0
diff --git a/trunk/Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt b/trunk/Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt
diff --git a/trunk/drivers/hid/hid-sensor-hub.c b/trunk/drivers/hid/hid-sensor-hub.c
@@ -596,7 +596,7 @@ static int sensor_hub_probe(struct hid_device *hdev,
 		}
 	}
 	ret = mfd_add_devices(&hdev->dev, 0, sd->hid_sensor_hub_client_devs,
-		sd->hid_sensor_client_cnt, NULL, 0);
+		sd->hid_sensor_client_cnt, NULL, 0, NULL);
 	if (ret < 0)
 		goto err_free_names;
 

diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -140,6 +140,4 @@ source "drivers/staging/silicom/Kconfig"
 
 source "drivers/staging/ced1401/Kconfig"
 
-source "drivers/staging/imx-drm/Kconfig"
-
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -62,4 +62,3 @@ obj-$(CONFIG_OMAP_BANDGAP)	+= omap-thermal/
 obj-$(CONFIG_ZCACHE2)		+= ramster/
 obj-$(CONFIG_NET_VENDOR_SILICOM)	+= silicom/
 obj-$(CONFIG_CED1401)		+= ced1401/
-obj-$(CONFIG_DRM_IMX)		+= imx-drm/
diff --git a/trunk/drivers/staging/bcm/CmHost.c b/trunk/drivers/staging/bcm/CmHost.c
@@ -1913,7 +1913,7 @@ int get_dsx_sf_data_to_application(struct bcm_mini_adapter *Adapter, UINT uiSFId
 VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter, PUINT puiBuffer)
 {
 	B_UINT32 u32NumofSFsinMsg = ntohl(*(puiBuffer + 1));
-	struct bcm_stim_sfhostnotify *pHostInfo = NULL;
+	stIM_SFHostNotify *pHostInfo = NULL;
 	UINT uiSearchRuleIndex = 0;
 	ULONG ulSFID = 0;
 
@@ -1922,7 +1922,7 @@ VOID OverrideServiceFlowParams(struct bcm_mini_adapter *Adapter, PUINT puiBuffer
 
 	while (u32NumofSFsinMsg != 0 && u32NumofSFsinMsg < NO_OF_QUEUES) {
 		u32NumofSFsinMsg--;
-		pHostInfo = (struct bcm_stim_sfhostnotify *)puiBuffer;
+		pHostInfo = (stIM_SFHostNotify *)puiBuffer;
 		puiBuffer = (PUINT)(pHostInfo + 1);
 
 		ulSFID = ntohl(pHostInfo->SFID);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -140,6 +140,4 @@ source "drivers/staging/silicom/Kconfig"

		source "drivers/staging/ced1401/Kconfig"

		source "drivers/staging/imx-drm/Kconfig"

		endif # STAGING