Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a2f3819 authored by Larry Finger's avatar Larry Finger
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 4684fe01 d4348c67

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -1676,8 +1676,7 @@ F: kernel/cgroup* 
F:	mm/*cgroup*



CORETEMP HARDWARE MONITORING DRIVER

M:	Rudolf Marek <r.marek@assembler.cz>

M:	Huaxu Wan <huaxu.wan@intel.com>

M:	Fenghua Yu <fenghua.yu@intel.com>

L:	lm-sensors@lm-sensors.org

S:	Maintained

F:	Documentation/hwmon/coretemp

arch/arm/mach-imx/mach-cpuimx27.c

+2 −2
Original line number Diff line number Diff line
@@ -279,13 +279,13 @@ static void __init eukrea_cpuimx27_init(void) 
#if defined(CONFIG_USB_ULPI)

	if (otg_mode_host) {

		otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



		mxc_register_device(&mxc_otg_host, &otg_pdata);

	}



	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

#endif

arch/arm/mach-imx/mach-pca100.c

+2 −2
Original line number Diff line number Diff line
@@ -419,13 +419,13 @@ static void __init pca100_init(void) 
#if defined(CONFIG_USB_ULPI)

	if (otg_mode_host) {

		otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



		mxc_register_device(&mxc_otg_host, &otg_pdata);

	}



	usbh2_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



	mxc_register_device(&mxc_usbh2, &usbh2_pdata);

#endif

arch/arm/mach-mx25/mach-cpuimx25.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static void __init eukrea_cpuimx25_init(void) 
#if defined(CONFIG_USB_ULPI)

	if (otg_mode_host) {

		otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



		mxc_register_device(&mxc_otg, &otg_pdata);

	}

arch/arm/mach-mx3/mach-cpuimx35.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static void __init mxc_board_init(void) 
#if defined(CONFIG_USB_ULPI)

	if (otg_mode_host) {

		otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,

				USB_OTG_DRV_VBUS | USB_OTG_DRV_VBUS_EXT);

				ULPI_OTG_DRVVBUS | ULPI_OTG_DRVVBUS_EXT);



		mxc_register_device(&mxc_otg_host, &otg_pdata);

	}