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:
  sparc64: Add very basic XVR-1000 framebuffer driver.
  qlogicpti: Remove slash in QlogicPTI irq name

diff --combined drivers/video/Kconfig
index 1c60053439a9459afd6cf3263a5f492dc28e1d68,a5755b88de2aca3cddc5a7806f51ffa95f72575e..dabe804ba575ecdd714873795ee7c081d474cc28
--- 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
@@@ -912,6 -909,18 +912,18 @@@ config FB_XVR250
          mostly initialized the card already.  It is treated as a
          completely dumb framebuffer device.
  
+ config FB_XVR1000
+       bool "Sun XVR-1000 support"
+       depends on SPARC64
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         This is the framebuffer device for the Sun XVR-1000 and similar
+         graphics cards.  The driver only works on sparc64 systems where
+         the system firmware has mostly initialized the card already.  It
+         is treated as a completely dumb framebuffer device.
+ 
  config FB_PVR2
        tristate "NEC PowerVR 2 display support"
        depends on FB && SH_DREAMCAST
@@@ -1497,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
@@@ -1947,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

diff --combined drivers/video/Makefile
index a42ad55e3a156be53c2a2d273db1e5bc744915a1,8c9a35778c930ccc822471a5226bfa93ad07e443..ddc2af2ba45bc68c6404ff96d973098f3a298e43
--- 1/drivers/video/Makefile
--- 2/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@@ -79,6 -79,7 +79,7 @@@ obj-$(CONFIG_FB_N411)             += n4
  obj-$(CONFIG_FB_HGA)              += hgafb.o
  obj-$(CONFIG_FB_XVR500)           += sunxvr500.o
  obj-$(CONFIG_FB_XVR2500)          += sunxvr2500.o
+ obj-$(CONFIG_FB_XVR1000)          += sunxvr1000.o
  obj-$(CONFIG_FB_IGA)              += igafb.o
  obj-$(CONFIG_FB_APOLLO)           += dnfb.o
  obj-$(CONFIG_FB_Q40)              += q40fb.o
@@@ -129,7 -130,6 +130,7 @@@ obj-$(CONFIG_XEN_FBDEV_FRONTEND)  += xe
  obj-$(CONFIG_FB_CARMINE)          += carminefb.o
  obj-$(CONFIG_FB_MB862XX)        += mb862xx/
  obj-$(CONFIG_FB_MSM)              += msm/
 +obj-$(CONFIG_FB_NUC900)           += nuc900fb.o
  
  # Platform or fallback drivers go here
  obj-$(CONFIG_FB_UVESA)            += uvesafb.o