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

Commit 88c144b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6 

Pull fbdev fixes from Florian Tobias Schandinat:

 - two fixes for s3c-fb by Jingoo Han (including a fix for a potential
   division by zero)

 - a couple of randconfig fixes by Arnd Bergmann

 - a cleanup for bfin_adv7393fb by Emil Goode

* tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6:
  video: s3c-fb: fix possible division by zero in s3c_fb_calc_pixclk
  video: s3c-fb: clear SHADOWCON register when clearing hardware window registers
  drivers/tosa: driver needs I2C and SPI to compile
  drivers/savagefb: use mdelay instead of udelay
  video/console: automatically select a font
  video/ili9320: do not mark exported functions __devexit
  drivers/video: use correct __devexit_p annotation
  video: bfin_adv7393fb: Convert to kstrtouint_from_user
parents 9b15b817 b6798951

drivers/video/backlight/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ config LCD_PLATFORM 


config LCD_TOSA

	tristate "Sharp SL-6000 LCD Driver"

	depends on SPI && MACH_TOSA

	depends on I2C && SPI && MACH_TOSA

	help

	  If you have an Sharp SL-6000 Zaurus say Y to enable a driver

	  for its LCD.

drivers/video/backlight/ili9320.c

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ int __devinit ili9320_probe_spi(struct spi_device *spi, 


EXPORT_SYMBOL_GPL(ili9320_probe_spi);



int __devexit ili9320_remove(struct ili9320 *ili)

int ili9320_remove(struct ili9320 *ili)

{

	ili9320_power(ili, FB_BLANK_POWERDOWN);

drivers/video/bfin_adv7393fb.c

+2 −4
Original line number Diff line number Diff line
@@ -353,18 +353,16 @@ adv7393_read_proc(char *page, char **start, off_t off, 


static int

adv7393_write_proc(struct file *file, const char __user * buffer,

		   unsigned long count, void *data)

		   size_t count, void *data)

{

	struct adv7393fb_device *fbdev = data;

	char line[8];

	unsigned int val;

	int ret;



	ret = copy_from_user(line, buffer, count);

	ret = kstrtouint_from_user(buffer, count, 0, &val);

	if (ret)

		return -EFAULT;



	val = simple_strtoul(line, NULL, 0);

	adv7393_write(fbdev->client, val >> 8, val & 0xff);



	return count;

drivers/video/broadsheetfb.c

+1 −1
Original line number Diff line number Diff line
@@ -1211,7 +1211,7 @@ static int __devexit broadsheetfb_remove(struct platform_device *dev) 


static struct platform_driver broadsheetfb_driver = {

	.probe	= broadsheetfb_probe,

	.remove = broadsheetfb_remove,

	.remove = __devexit_p(broadsheetfb_remove),

	.driver	= {

		.owner	= THIS_MODULE,

		.name	= "broadsheetfb",

drivers/video/console/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -224,5 +224,19 @@ config FONT_10x18 
	  big letters. It fits between the sun 12x22 and the normal 8x16 font.

	  If other fonts are too big or too small for you, say Y, otherwise say N.



config FONT_AUTOSELECT

	def_bool y

	depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON

	depends on !FONT_8x8

	depends on !FONT_6x11

	depends on !FONT_7x14

	depends on !FONT_PEARL_8x8

	depends on !FONT_ACORN_8x8

	depends on !FONT_MINI_4x6

	depends on !FONT_SUN8x16

	depends on !FONT_SUN12x22

	depends on !FONT_10x18

	select FONT_8x16



endmenu