kernel.git/drivers/video/savage, branch linux-3.6.y

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2012-07-24T20:34:56Z

Pull trivial tree from Jiri Kosina: "Trivial updates all over the place as usual." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits) Fix typo in include/linux/clk.h . pci: hotplug: Fix typo in pci iommu: Fix typo in iommu video: Fix typo in drivers/video Documentation: Add newline at end-of-file to files lacking one arm,unicore32: Remove obsolete "select MISC_DEVICES" module.c: spelling s/postition/position/g cpufreq: Fix typo in cpufreq driver trivial: typo in comment in mksysmap mach-omap2: Fix typo in debug message and comment scsi: aha152x: Fix sparse warning and make printing pointer address more portable. Change email address for Steve Glendinning Btrfs: fix typo in convert_extent_bit via: Remove bogus if check netprio_cgroup.c: fix comment typo backlight: fix memory leak on obscure error path Documentation: asus-laptop.txt references an obsolete Kconfig item Documentation: ManagementStyle: fixed typo mm/vmscan: cleanup comment error in balance_pgdat mm: cleanup on the comments of zone_reclaim_stat ...

video: Fix typo in drivers/video

2012-07-24T10:58:15Z

Correct spelling typo in debug messages and comments within drivers/video. Signed-off-by: Masanari Iida Signed-off-by: Jiri Kosina

drivers/savagefb: use mdelay instead of udelay

2012-06-09T12:51:12Z

Long delays need to use mdelay on architectures such as ARM that cannot compute long timeouts in udelay. Signed-off-by: Arnd Bergmann Signed-off-by: Mathieu Poirier Signed-off-by: Florian Tobias Schandinat

Remove all #inclusions of asm/system.h

2012-03-28T17:30:03Z

Remove all #inclusions of asm/system.h preparatory to splitting and killing it. Performed with the following command: perl -p -i -e 's!^#\s*include\s*.*\n!!' `grep -Irl '^#\s*include\s*' *` Signed-off-by: David Howells

video: Add module.h to drivers/video files who really use it.

2011-10-31T23:31:33Z

They were getting this implicitly by an include of module.h from device.h -- but we are going to clean that up and break that include chain, so include module.h explicitly now. [ with contributions from Axel Lin ] Signed-off-by: Paul Gortmaker

savagefb: use display information in info not in var for panning

2011-08-19T08:34:44Z

We must not use any information in the passed var besides xoffset, yoffset and vmode as otherwise applications might abuse it. Also use the aligned fix.line_length and not the (possible) unaligned xres_virtual. Signed-off-by: Laurent Pinchart Reviewed-by: Tormod Volden

savagedb: Fix typo causing regression in savage4 series video chip detection

2011-08-06T19:02:40Z

Two additional savage4 variants were added, but the S3_SAVAGE4_SERIES macro was incompletely modified, resulting in a false positive detection of a savage4 card regardless of which savage card is actually present. For non-savage4 series cards, such as a Savage/IX-MV card, this results in garbled video and/or a hard-hang at boot time. Fix this by changing an '||' to an '&&' in the S3_SAVAGE4_SERIES macro. Signed-off-by: John P. Stanley Reviewed-by: Tormod Volden [ The macros have incomplete parenthesis too, but whatever .. -Linus ] Signed-off-by: Linus Torvalds

savagefb: Use panel CVT mode as default

2011-06-02T08:05:18Z

If there is no EDID but an LCD panel is detected, generate a CVT mode from the panel resolution (at 60 Hz), and use this as a default mode instead of the hardcoded 800x600x8 mode. Signed-off-by: Tormod Volden Signed-off-by: Paul Mundt

savagefb: Enable LCD detection on mobile Twister

2011-05-24T07:05:06Z

Copy and paste from the Xorg DDX. Tested on TwisterK (Compaq Presario 700). Signed-off-by: Tormod Volden Signed-off-by: Paul Mundt

savagefb: New S3_TWISTER and S3_PROSAVAGEDDR chip families

2011-05-24T07:04:54Z

Realign the chip families with the Xorg DDX Signed-off-by: Tormod Volden Signed-off-by: Paul Mundt