into ppc970.osdl.org:/home/torvalds/v2.6/linux

into kernel.bkbits.net:/home/davem/sparc-2.6

The callers used to do it, but with the 4-level page
table code this is no longer the case.  Noticed by
Nick Piggin and Andrew Morton.
Signed-off-by: David S. Miller <davem@davemloft.net>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Reported by Wakko Warner.

The megaraid driver is trying to remove a non-empty directory in procfs.

Trivially fixed by first unregistering the driver, which will remove all
the per-controller files in the megaraid directory, and only _then_
removing the megaraid /proc directory entry.

into shinybook.infradead.org:/home/dwmw2/bk/mtd-2.6

Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Let the CVS idents catch up where changes have been made upstream.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Also some cosmetic fixes in the map driver itself.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

This allows one kernel build to support multiple machines.
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Rewritten alternative driver by Gareth Bult and Jörn Engel.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

I took a look at the cause for these warnings in the 2.6.10 kernel,

drivers/mtd/maps/nettel.c:361: warning: assignment makes pointer from integer without a cast
drivers/mtd/maps/nettel.c:395: warning: assignment makes pointer from integer without a cast

and as far as I can see the casts in there (to unsigned long and back to
void*) are completely unnessesary ('virt' in 'struct map_info' is a void
__iomem *), and getting rid of those casts buys us a warning free build.
Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

The patch below fixes a small but fatal bug in the code that handles
non-buswidth-aligned writes. The problem is that the code used the same
index in both map_word and buf, therefore putting the wrong words in the
map_word that partially contains old data and partially contains new
data. The result: corrupt data is being written.
Signed-off-by: Koen Martens <kmartens@sonologic.nl>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

into shinybook.infradead.org:/home/dwmw2/bk/mtd-2.6

Reduce local variable (large struct) stack usage in zoran_do_ioctl() from 1028
bytes to 324 bytes (on x86-32) by declaring & using only 1 "struct
zoran_jpg_settings" instead of 5 instances of it.  Reduced from 5 * 180 bytes
to 1 * 180 bytes, plus other locals in each case.
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Attached patch adds some host<->le conversion functions for 32-bit integers.
The hardware expects 32-bit integers, which the host does not always provide. 
With the attached patch, the hardware runs fine on PPC hardware as well.

Original patch by Ben Capper <benandeve@optusnet.com.au>.
Signed-off-by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Attached patch fixes the writing of APP (application-specific) and COM
(comment) markers in the JPEG stream as generated by the zr36050 or zr36060
encoders, both part of the zr36067 driver.

During separating those bits out of the main zoran driver, we accidently
removed the interface through which applications can adapt those markers,
replacing them by unchangeable (static) markers.  Some video formats,
particularly Quicktime and AVI, require specific container-specific markers in
the stream for interlaced streams.  Those markers specify field order and
such.

The attached patch re-adds this feature so that decoders depending on those
container-specific markers for correct playback will work correctly.
Signed-off-by: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Reduce stack usage in intelfb_set_par() from 2404 bytes (on x86-32) to 12
bytes.
Signed-off-by: Randy Dunlap <rddunlap@osdl.org>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

From: Martin Wilck

..I am asking because we have encountered a video device that obviously 
has problems displaying the standard mode of the vga16fb driver...

The default timings give a vtotal of 529 instead of 525 in 640x480@60.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add Viewsonic PF775a to broken display database
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Do a symbol_put() for each symbol_get() in savagefb.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The function fb_add_videomode can fail, check return value. 
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Add blanking event to the notifier call chain.  This can be used by fbcon
to blank/unblank the console, and theoretically, by backlight drivers.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The global_mode_option is useful for choosing the initial video mode
without specifying the driver, ie 'video=1024x768@60'.  After the
initialization cleanup, this variable was accidentally removed.  This patch
brings it back again.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

The file drivers/video/aty/xlinit.c is currently unused.  This file might be
useful to boot some types of RageXL cards on non-x86 platforms.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- Change timings to as close as possible to VESA specs and
  use msecs_to_jiffies() instead of hard-coded number
- Attempt to read all i2c busses regardless of chipset type
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Both the r128 and radeon fb drivers do bad things with the PCI BAR
corresponding to their option ROM.  They incorrectly use the host address
instead of the BAR address to enable the ROM, and then incorrectly lose the
original value on unmap.  This patch fixes both problems.  Tested on Altix.
Signed-off-by: Jesse Barnes <jbarnes@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Handle 24bit on big-endian by leaving the hardware in RGB and using the
colour offset to reverse red/blue.  Leaving the hardware in RGB means that
fbi displays images correctly (abeit fortuitously) and the console is
correct, thanks to a recent patch to the console code correcting an endian
bug in fbcon_putc().
Signed-off-by: Jim Hague <jim.hague@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

A collection of changes that taken together makes the driver work correctly on
big-endian systems, specifically Sparc.

- Remove old PM2FB_BE_APERTURE define and use __BIG_ENDIAN
  throughout. PM2FB_BE_APERTURE wasn't defined on Sparc; this
  was incorrect.
- Replace colour mode magic numbers with suitable constants,
  and tidy colour mode handling. Use BGR not RGB at 24bit on
  big-endian.
- Replace aperture magic numbers with constants. Rearrange code to
  emphasise second aperture is not used. Add short explanations
  of aperture settings for big endian.
- Update comments to note that the driver now works on Sparc.
- Revisit 32bit depth colour offsets and ensure transp is set.
Signed-off-by: Jim Hague <jim.hague@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- modedb is now available in modules.
Signed-off-by: Jim Hague <jim.hague@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- From 2.4 driver: Save memory config registers at init and restore after card
  reset. Reset card on mode change.
Signed-off-by: Jim Hague <jim.hague@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

- Update MODULE_PARM to module_param.
- Omit some non-module code from module builds and vice-versa.
Signed-off-by: Jim Hague <jim.hague@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Make sure the fbdev sysfs class is registered before all drivers, otherwise
some symlinks are missing.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

attached is an update for sisfb, lifting it up to version 1.7.17.

It contains all changes done behind my back by other people (viro,
torvalds, adaplas) in the meantime. Furthermore,

- all remaining sparse warnings were fixed (mainly caused by the ROM code)

- problems with very old and brand new BIOSes from SiS were fixed,

- LCD setup was simplified, allowing more display modes than before,

- UMC/charter bridge type handling was added,

- a code clean-up was performed, the new FB_BLANK-flags were taken over,
VBLANK status info was corrected, etc.
Signed-off-by: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

With Kirill Korotaev <kk@sw.ru>

invalidate_inodes() can take a large amount of time searching the inode
lists for inodes which belong to this fs.  Add a separate list for this
search.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Walk the recall_lru and reap unused or timed-out delegations.
Signed-off-by: Andy Adamson <andros@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>