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

Commit 938c0ace authored by Russell King's avatar Russell King
Browse files

Merge branch 'devel' of... 

Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

Conflicts:
	arch/arm/mach-pxa/tosa.c
parents 16c29daf 5898eb79

arch/arm/include/asm/mach/udc_pxa2xx.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ struct pxa2xx_udc_mach_info { 
	 * VBUS IRQ and omit the methods above.  Store the GPIO number

	 * here.  Note that sometimes the signals go through inverters...

	 */

	bool	gpio_vbus_inverted;

	int	gpio_vbus;			/* high == vbus present */

	bool	gpio_pullup_inverted;

	int	gpio_pullup;			/* high == pullup activated */

};

arch/arm/mach-pxa/am200epd.c

+4 −4
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ static int am200_init_gpio_regs(struct metronomefb_par *par) 
	return 0;



err_req_gpio:

	while (i > 0)

		gpio_free(gpios[i--]);

	while (--i >= 0)

		gpio_free(gpios[i]);



	return err;

}
@@ -194,7 +194,7 @@ static struct notifier_block am200_fb_notif = { 
};



/* this gets called as part of our init. these steps must be done now so

 * that we can use set_pxa_fb_info */

 * that we can use pxa_set_fb_info */

static void __init am200_presetup_fb(void)

{

	int fw;
@@ -249,7 +249,7 @@ static void __init am200_presetup_fb(void) 
	/* we divide since we told the LCD controller we're 16bpp */

	am200_fb_info.modes->xres /= 2;



	set_pxa_fb_info(&am200_fb_info);

	pxa_set_fb_info(NULL, &am200_fb_info);



}

arch/arm/mach-pxa/am300epd.c

+7 −6
Original line number Diff line number Diff line
@@ -125,10 +125,7 @@ static int am300_init_gpio_regs(struct broadsheetfb_par *par) 
		if (err) {

			dev_err(&am300_device->dev, "failed requesting "

				"gpio %d, err=%d\n", i, err);

			while (i >= DB0_GPIO_PIN)

				gpio_free(i--);

			i = ARRAY_SIZE(gpios) - 1;

			goto err_req_gpio;

			goto err_req_gpio2;

		}

	}
@@ -159,9 +156,13 @@ static int am300_init_gpio_regs(struct broadsheetfb_par *par) 


	return 0;



err_req_gpio2:

	while (--i >= DB0_GPIO_PIN)

		gpio_free(i);

	i = ARRAY_SIZE(gpios);

err_req_gpio:

	while (i > 0)

		gpio_free(gpios[i--]);

	while (--i >= 0)

		gpio_free(gpios[i]);



	return err;

}

arch/arm/mach-pxa/balloon3.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static void __init balloon3_lcd_init(void) 
	}



	balloon3_lcd_screen.pxafb_backlight_power = balloon3_backlight_power;

	set_pxa_fb_info(&balloon3_lcd_screen);

	pxa_set_fb_info(NULL, &balloon3_lcd_screen);

	return;



err2:

arch/arm/mach-pxa/cm-x2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ __setup("monitor=", cmx2xx_set_display); 


static void __init cmx2xx_init_display(void)

{

	set_pxa_fb_info(cmx2xx_display);

	pxa_set_fb_info(NULL, cmx2xx_display);

}

#else

static inline void cmx2xx_init_display(void) {}