Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sunxvr1000: Add missing FB=y depenency.
  MAINTAINERS: Add entry for sparc serial drivers.
  drivers/serial/sunsab.c: adjust the constant used to initialize the interrupt_mask0 fields

diff --combined MAINTAINERS
index 47cc449d89d89746b1dba3cda6aae88afe1bf990,a1cb1e6f6beeac82040f0faebf72606b8960ddf2..382eaa4d0068540f624ce77c88b266003f2a082a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -71,7 -71,6 +71,7 @@@ Descriptions of section entries
        M: Mail patches to: FullName <address@domain>
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
 +      Q: Patchwork web based patch tracking system site
        T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
        S: Status, one of the following:
           Supported:   Someone is actually paid to look after this.
@@@ -183,7 -182,6 +183,7 @@@ M: Ron Minnich <rminnich@sandia.gov
  M:    Latchesar Ionkov <lucho@ionkov.net>
  L:    v9fs-developer@lists.sourceforge.net
  W:    http://swik.net/v9fs
 +Q:    http://patchwork.kernel.org/project/v9fs-devel/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
  S:    Maintained
  F:    Documentation/filesystems/9p.txt
@@@ -240,7 -238,6 +240,7 @@@ ACP
  M:    Len Brown <lenb@kernel.org>
  L:    linux-acpi@vger.kernel.org
  W:    http://www.lesswatts.org/projects/acpi/
 +Q:    http://patchwork.kernel.org/project/linux-acpi/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
  S:    Supported
  F:    drivers/acpi/
@@@ -431,6 -428,7 +431,6 @@@ P: Jordan Crous
  L:    linux-geode@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
  S:    Supported
 -F:    arch/x86/kernel/geode_32.c
  F:    drivers/char/hw_random/geode-rng.c
  F:    drivers/crypto/geode*
  F:    drivers/video/geode/
@@@ -666,12 -664,6 +666,12 @@@ T:       git://git.pengutronix.de/git/imx/lin
  F:    arch/arm/mach-mx*/
  F:    arch/arm/plat-mxc/
  
 +ARM/FREESCALE IMX51
 +M:    Amit Kucheria <amit.kucheria@canonical.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-mx5/
 +
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -945,16 -937,6 +945,16 @@@ W:       http://www.fluff.org/ben/linux
  S:    Maintained
  F:    arch/arm/mach-s3c6410/
  
 +ARM/SHMOBILE ARM ARCHITECTURE
 +M:    Paul Mundt <lethal@linux-sh.org>
 +M:    Magnus Damm <magnus.damm@gmail.com>
 +L:    linux-sh@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
 +W:    http://oss.renesas.com
 +S:    Supported
 +F:    arch/arm/mach-shmobile/
 +F:    drivers/sh/
 +
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -984,13 -966,6 +984,13 @@@ W:       http://www.arm.linux.org.uk
  S:    Maintained
  F:    arch/arm/vfp/
  
 +ASC7621 HARDWARE MONITOR DRIVER
 +M:    George Joseph <george.joseph@fairview5.com>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/asc7621
 +F:    drivers/hwmon/asc7621.c
 +
  ASUS ACPI EXTRAS DRIVER
  M:    Corentin Chary <corentincj@iksaif.net>
  M:    Karol Kozimor <sziwan@users.sourceforge.net>
@@@ -1251,13 -1226,6 +1251,13 @@@ W:    http://blackfin.uclinux.or
  S:    Supported
  F:    drivers/rtc/rtc-bfin.c
  
 +BLACKFIN SDH DRIVER
 +M:    Cliff Cai <cliff.cai@analog.com>
 +L:    uclinux-dist-devel@blackfin.uclinux.org
 +W:    http://blackfin.uclinux.org
 +S:    Supported
 +F:    drivers/mmc/host/bfin_sdh.c
 +
  BLACKFIN SERIAL DRIVER
  M:    Sonic Zhang <sonic.zhang@analog.com>
  L:    uclinux-dist-devel@blackfin.uclinux.org
@@@ -1364,7 -1332,6 +1364,7 @@@ BTRFS FILE SYSTE
  M:    Chris Mason <chris.mason@oracle.com>
  L:    linux-btrfs@vger.kernel.org
  W:    http://btrfs.wiki.kernel.org/
 +Q:    http://patchwork.kernel.org/project/linux-btrfs/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable.git
  S:    Maintained
  F:    Documentation/filesystems/btrfs.txt
@@@ -1405,30 -1372,20 +1405,30 @@@ F:   arch/x86/include/asm/calgary.
  F:    arch/x86/include/asm/tce.h
  
  CAN NETWORK LAYER
 -M:    Urs Thuermann <urs.thuermann@volkswagen.de>
 +M:    Oliver Hartkopp <socketcan@hartkopp.net>
  M:    Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
 -L:    socketcan-core@lists.berlios.de (subscribers-only)
 +M:    Urs Thuermann <urs.thuermann@volkswagen.de>
 +L:    socketcan-core@lists.berlios.de
 +L:    netdev@vger.kernel.org
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
 -F:    drivers/net/can/
 -F:    include/linux/can/
 +F:    net/can/
  F:    include/linux/can.h
 +F:    include/linux/can/core.h
 +F:    include/linux/can/bcm.h
 +F:    include/linux/can/raw.h
  
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <wg@grandegger.com>
 -L:    socketcan-core@lists.berlios.de (subscribers-only)
 +L:    socketcan-core@lists.berlios.de
 +L:    netdev@vger.kernel.org
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
 +F:    drivers/net/can/
 +F:    include/linux/can/dev.h
 +F:    include/linux/can/error.h
 +F:    include/linux/can/netlink.h
 +F:    include/linux/can/platform/
  
  CELL BROADBAND ENGINE ARCHITECTURE
  M:    Arnd Bergmann <arnd@arndb.de>
@@@ -1539,7 -1496,6 +1539,7 @@@ M:      Steve French <sfrench@samba.org
  L:    linux-cifs-client@lists.samba.org (moderated for non-subscribers)
  L:    samba-technical@lists.samba.org (moderated for non-subscribers)
  W:    http://linux-cifs.samba.org/
 +Q:    http://patchwork.ozlabs.org/project/linux-cifs-client/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
  S:    Supported
  F:    Documentation/filesystems/cifs.txt
@@@ -1826,7 -1782,6 +1826,7 @@@ DEVICE-MAPPER  (LVM
  P:    Alasdair Kergon
  L:    dm-devel@redhat.com
  W:    http://sources.redhat.com/dm
 +Q:    http://patchwork.kernel.org/project/dm-devel/list/
  S:    Maintained
  F:    Documentation/device-mapper/
  F:    drivers/md/dm*
@@@ -2140,7 -2095,6 +2140,7 @@@ F:      drivers/net/eexpress.
  ETHERNET BRIDGE
  M:    Stephen Hemminger <shemminger@linux-foundation.org>
  L:    bridge@lists.linux-foundation.org
 +L:    netdev@vger.kernel.org
  W:    http://www.linux-foundation.org/en/Net:Bridge
  S:    Maintained
  F:    include/linux/netfilter_bridge/
@@@ -2172,7 -2126,6 +2172,7 @@@ M:      "Theodore Ts'o" <tytso@mit.edu
  M:    Andreas Dilger <adilger@sun.com>
  L:    linux-ext4@vger.kernel.org
  W:    http://ext4.wiki.kernel.org
 +Q:    http://patchwork.ozlabs.org/project/linux-ext4/list/
  S:    Maintained
  F:    Documentation/filesystems/ext4.txt
  F:    fs/ext4/
@@@ -2549,6 -2502,13 +2549,6 @@@ L:     linux-parisc@vger.kernel.or
  S:    Maintained
  F:    sound/parisc/harmony.*
  
 -HAYES ESP SERIAL DRIVER
 -M:    "Andrew J. Robinson" <arobinso@nyx.net>
 -W:    http://www.nyx.net/~arobinso
 -S:    Maintained
 -F:    Documentation/serial/hayes-esp.txt
 -F:    drivers/char/esp.c
 -
  HEWLETT-PACKARD SMART2 RAID DRIVER
  M:    Chirag Kantharia <chirag.kantharia@hp.com>
  L:    iss_storagedev@hp.com
@@@ -2757,7 -2717,6 +2757,7 @@@ F:      drivers/scsi/ips.
  IDE SUBSYSTEM
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-ide@vger.kernel.org
 +Q:    http://patchwork.ozlabs.org/project/linux-ide/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git
  S:    Maintained
  F:    Documentation/ide/
@@@ -2812,7 -2771,6 +2812,7 @@@ M:      Sean Hefty <sean.hefty@intel.com
  M:    Hal Rosenstock <hal.rosenstock@gmail.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.openib.org/
 +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git
  S:    Supported
  F:    Documentation/infiniband/
@@@ -2832,13 -2790,12 +2832,13 @@@ INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCH
  M:    Dmitry Torokhov <dmitry.torokhov@gmail.com>
  M:    Dmitry Torokhov <dtor@mail.ru>
  L:    linux-input@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-input/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
  S:    Maintained
  F:    drivers/input/
  
  INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
 -M:    Sylvain Meyer <sylvain.meyer@worldonline.fr>
 +M:    Maik Broemme <mbroemme@plusserver.de>
  L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    Documentation/fb/intelfb.txt
@@@ -3089,13 -3046,6 +3089,13 @@@ W:    http://www.melware.d
  S:    Maintained
  F:    drivers/isdn/hardware/eicon/
  
 +IT87 HARDWARE MONITORING DRIVER
 +M:    Jean Delvare <khali@linux-fr.org>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/it87
 +F:    drivers/hwmon/it87.c
 +
  IVTV VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@radix.net>
  L:    ivtv-devel@ivtvdriver.org (moderated for non-subscribers)
@@@ -3149,7 -3099,6 +3149,7 @@@ F:      drivers/hwmon/k8temp.
  KCONFIG
  M:    Roman Zippel <zippel@linux-m68k.org>
  L:    linux-kbuild@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-kbuild/list/
  S:    Maintained
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
@@@ -3224,7 -3173,7 +3224,7 @@@ F:      arch/x86/include/asm/svm.
  F:    arch/x86/kvm/svm.c
  
  KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
 -M:    Hollis Blanchard <hollisb@us.ibm.com>
 +M:    Alexander Graf <agraf@suse.de>
  L:    kvm-ppc@vger.kernel.org
  W:    http://kvm.qumranet.com
  S:    Supported
@@@ -3363,7 -3312,6 +3363,7 @@@ M:      Benjamin Herrenschmidt <benh@kernel.
  M:    Paul Mackerras <paulus@samba.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@ozlabs.org
 +Q:    http://patchwork.ozlabs.org/project/linuxppc-dev/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git
  S:    Supported
  F:    Documentation/powerpc/
@@@ -3484,13 -3432,6 +3484,13 @@@ S:    Maintaine
  F:    Documentation/ldm.txt
  F:    fs/partitions/ldm.*
  
 +LogFS
 +M:    Joern Engel <joern@logfs.org>
 +L:    logfs@logfs.org
 +W:    logfs.org
 +S:    Maintained
 +F:    fs/logfs/
 +
  LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
  M:    Eric Moore <Eric.Moore@lsi.com>
  M:    support@lsi.com
@@@ -3627,7 -3568,6 +3627,7 @@@ M:      Mauro Carvalho Chehab <mchehab@infra
  P:    LinuxTV.org Project
  L:    linux-media@vger.kernel.org
  W:    http://linuxtv.org
 +Q:    http://patchwork.kernel.org/project/linux-media/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
  F:    Documentation/dvb/
@@@ -3655,7 -3595,7 +3655,7 @@@ F:      mm
  
  MEMORY RESOURCE CONTROLLER
  M:    Balbir Singh <balbir@linux.vnet.ibm.com>
 -M:    Pavel Emelyanov <xemul@openvz.org>
 +M:    Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
  M:    KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
  L:    linux-mm@kvack.org
  S:    Maintained
@@@ -3663,9 -3603,8 +3663,9 @@@ F:      mm/memcontrol.
  
  MEMORY TECHNOLOGY DEVICES (MTD)
  M:    David Woodhouse <dwmw2@infradead.org>
 -W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
 +W:    http://www.linux-mtd.infradead.org/
 +Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
  T:    git git://git.infradead.org/mtd-2.6.git
  S:    Maintained
  F:    drivers/mtd/
@@@ -3925,7 -3864,6 +3925,7 @@@ S:      Maintaine
  NETWORKING [WIRELESS]
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-wireless/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git
  S:    Maintained
  F:    net/mac80211/
@@@ -4018,7 -3956,6 +4018,7 @@@ M:      Tony Lindgren <tony@atomide.com
  L:    linux-omap@vger.kernel.org
  W:    http://www.muru.com/linux/omap/
  W:    http://linux.omap.com/
 +Q:    http://patchwork.kernel.org/project/linux-omap/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
  S:    Maintained
  F:    arch/arm/*omap*/
@@@ -4245,7 -4182,6 +4245,7 @@@ M:      Helge Deller <deller@gmx.de
  M:    "James E.J. Bottomley" <jejb@parisc-linux.org>
  L:    linux-parisc@vger.kernel.org
  W:    http://www.parisc-linux.org/
 +Q:    http://patchwork.kernel.org/project/linux-parisc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
  S:    Maintained
  F:    arch/parisc/
@@@ -4288,7 -4224,6 +4288,7 @@@ F:      Documentation/powerpc/eeh-pci-error-
  PCI SUBSYSTEM
  M:    Jesse Barnes <jbarnes@virtuousgeek.org>
  L:    linux-pci@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-pci/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
  S:    Supported
  F:    Documentation/PCI/
@@@ -4327,13 -4262,10 +4327,13 @@@ PERFORMANCE EVENTS SUBSYSTE
  M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
  M:    Paul Mackerras <paulus@samba.org>
  M:    Ingo Molnar <mingo@elte.hu>
 +M:    Arnaldo Carvalho de Melo <acme@redhat.com>
  S:    Supported
  F:    kernel/perf_event.c
  F:    include/linux/perf_event.h
 -F:    arch/*/*/kernel/perf_event.c
 +F:    arch/*/kernel/perf_event.c
 +F:    arch/*/kernel/*/perf_event.c
 +F:    arch/*/kernel/*/*/perf_event.c
  F:    arch/*/include/asm/perf_event.h
  F:    arch/*/lib/perf_event.c
  F:    arch/*/kernel/perf_callchain.c
@@@ -4530,13 -4462,6 +4530,13 @@@ L:    linux-arm-kernel@lists.infradead.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
  S:    Maintained
  
 +MMP2 SUPPORT (aka ARMADA610)
 +M:    Haojian Zhuang <haojian.zhuang@marvell.com>
 +M:    Eric Miao <eric.y.miao@gmail.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 +S:    Maintained
 +
  PXA MMCI DRIVER
  S:    Orphan
  
@@@ -4674,7 -4599,6 +4674,7 @@@ F:      include/linux/rtc.
  REAL TIME CLOCK (RTC) SUBSYSTEM
  M:    Alessandro Zummo <a.zummo@towertech.it>
  L:    rtc-linux@googlegroups.com
 +Q:    http://patchwork.ozlabs.org/project/rtc-linux/list/
  S:    Maintained
  F:    Documentation/rtc.txt
  F:    drivers/rtc/
@@@ -5042,7 -4966,6 +5042,7 @@@ F:      drivers/*/*/*s3c2410
  TI DAVINCI MACHINE SUPPORT
  P:    Kevin Hilman
  M:    davinci-linux-open-source@linux.davincidsp.com
 +Q:    http://patchwork.kernel.org/project/linux-davinci/list/
  S:    Supported
  F:    arch/arm/mach-davinci
  
@@@ -5208,12 -5131,26 +5208,27 @@@ F:   include/sound/soc
  SPARC + UltraSPARC (sparc/sparc64)
  M:    "David S. Miller" <davem@davemloft.net>
  L:    sparclinux@vger.kernel.org
 +Q:    http://patchwork.ozlabs.org/project/sparclinux/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
  S:    Maintained
  F:    arch/sparc/
  
+ SPARC SERIAL DRIVERS
+ M:    "David S. Miller" <davem@davemloft.net>
+ L:    sparclinux@vger.kernel.org
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
+ S:    Maintained
+ F:    drivers/serial/suncore.c
+ F:    drivers/serial/suncore.h
+ F:    drivers/serial/sunhv.c
+ F:    drivers/serial/sunsab.c
+ F:    drivers/serial/sunsab.h
+ F:    drivers/serial/sunsu.c
+ F:    drivers/serial/sunzilog.c
+ F:    drivers/serial/sunzilog.h
+ 
  SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
  M:    Roger Wolff <R.E.Wolff@BitWizard.nl>
  S:    Supported
@@@ -5224,7 -5161,6 +5239,7 @@@ SPI SUBSYSTE
  M:    David Brownell <dbrownell@users.sourceforge.net>
  M:    Grant Likely <grant.likely@secretlab.ca>
  L:    spi-devel-general@lists.sourceforge.net
 +Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  S:    Maintained
  F:    Documentation/spi/
  F:    drivers/spi/
@@@ -5280,7 -5216,7 +5295,7 @@@ F:      drivers/net/starfire
  
  STARMODE RADIO IP (STRIP) PROTOCOL DRIVER
  S:    Orphan
 -F:    drivers/net/wireless/strip.c
 +F:    drivers/staging/strip/strip.c
  F:    include/linux/if_strip.h
  
  STRADIS MPEG-2 DECODER DRIVER
@@@ -5301,7 -5237,6 +5316,7 @@@ SUPER
  M:    Paul Mundt <lethal@linux-sh.org>
  L:    linux-sh@vger.kernel.org
  W:    http://www.linux-sh.org
 +Q:    http://patchwork.kernel.org/project/linux-sh/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git
  S:    Supported
  F:    Documentation/sh/
@@@ -6069,7 -6004,7 +6084,7 @@@ L:      linux-wireless@vger.kernel.or
  W:    http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
  S:    Maintained
  F:    Documentation/networking/wavelan.txt
 -F:    drivers/net/wireless/wavelan*
 +F:    drivers/staging/wavelan/
  
  WD7000 SCSI DRIVER
  M:    Miroslav Zagorac <zaga@fly.cc.fer.hr>
@@@ -6177,7 -6112,6 +6192,7 @@@ F:      arch/x86
  X86 PLATFORM DRIVERS
  M:    Matthew Garrett <mjg@redhat.com>
  L:    platform-driver-x86@vger.kernel.org
 +T:      git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
  S:    Maintained
  F:    drivers/platform/x86
  
@@@ -6265,7 -6199,6 +6280,7 @@@ F:      drivers/serial/zs.
  THE REST
  M:    Linus Torvalds <torvalds@linux-foundation.org>
  L:    linux-kernel@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/LKML/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
  S:    Buried alive in reporters
  F:    *

diff --combined drivers/video/Kconfig
index dabe804ba575ecdd714873795ee7c081d474cc28,f15fb024e80644689c6695ac26497556382df7e2..feaff4f04b5820b6dfd24ab7584728970b065cc4
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -400,12 -400,9 +400,12 @@@ config FB_SA110
          If you plan to use the LCD display with your SA-1100 system, say
          Y here.
  
 +config HAVE_FB_IMX
 +      bool
 +
  config FB_IMX
        tristate "Motorola i.MX LCD support"
 -      depends on FB && (ARCH_MX1 || ARCH_MX2)
 +      depends on FB && (HAVE_FB_IMX || ARCH_MX1 || ARCH_MX2)
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -914,7 -911,7 +914,7 @@@ config FB_XVR250
  
  config FB_XVR1000
        bool "Sun XVR-1000 support"
-       depends on SPARC64
+       depends on (FB = y) && SPARC64
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -1509,6 -1506,7 +1509,6 @@@ config FB_VI
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
 -       select FB_SOFT_CURSOR
         select I2C_ALGOBIT
         select I2C
         help
@@@ -1959,27 -1957,6 +1959,27 @@@ config FB_S3C2410_DEBU
          Turn on debugging messages. Note that you can set/unset at run time
          through sysfs
  
 +config FB_NUC900
 +        bool "NUC900 LCD framebuffer support"
 +        depends on FB && ARCH_W90X900
 +        select FB_CFB_FILLRECT
 +        select FB_CFB_COPYAREA
 +        select FB_CFB_IMAGEBLIT
 +        ---help---
 +          Frame buffer driver for the built-in LCD controller in the Nuvoton
 +          NUC900 processor
 +
 +config GPM1040A0_320X240
 +        bool "Giantplus Technology GPM1040A0 320x240 Color TFT LCD"
 +        depends on FB_NUC900
 +
 +config FB_NUC900_DEBUG
 +        bool "NUC900 lcd debug messages"
 +        depends on FB_NUC900
 +        help
 +          Turn on debugging messages. Note that you can set/unset at run time
 +          through sysfs
 +
  config FB_SM501
        tristate "Silicon Motion SM501 framebuffer support"
        depends on FB && MFD_SM501