Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (60 commits)
  microblaze_v8: Add MAINTAINERS fragment
  microblaze_v8: Uartlite for Microblaze
  microblaze_v8: Makefiles for Microblaze cpu
  microblaze_v8: Kconfig patches
  microblaze_v8: Interrupt handling and timer support
  microblaze_v8: syscalls.h
  microblaze_v8: pci headers
  microblaze_v8: Kbuild file
  microblaze_v8: string.h thread_info.h
  microblaze_v8: unistd.h
  microblaze_v8: fcntl.h sockios.h ucontext.h
  microblaze_v8: pool.h socket.h
  microblaze_v8: device.h param.h topology.h
  microblaze_v8: headers files entry.h current.h mman.h registers.h sembuf.h
  microblaze_v8: namei.h
  microblaze_v8: gpio.h, serial.h
  microblaze_v8: headers simple files - empty or redirect to asm-generic
  microblaze_v8: sigcontext.h siginfo.h
  microblaze_v8: termbits.h termios.h
  microblaze_v8: stats headers
  ...

diff --combined MAINTAINERS
index 5d843588e1de159958693aee543af4af2e82c6dc,7bfeed12a64cdd6b38acbfdb9491c3263fd2d734..bff9f9fafbbd3e6e8d76f41d902b76a6abf109a8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -357,7 -357,6 +357,7 @@@ S: Odd Fixes for 2.4; Maintained for 2.
  P:    Ivan Kokshaysky
  M:    [email protected]
  S:    Maintained for 2.4; PCI support for 2.6.
 +L:    [email protected]
  
  AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
  P:    Thomas Dahlmann
@@@ -503,13 -502,6 +503,13 @@@ P:       Richard Purdi
  M:    [email protected]
  S:    Maintained
  
 +ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
 +P:    Paulius Zaleckas
 +M:    [email protected]
 +L:    [email protected] (subscribers-only)
 +T:    git gitorious.org/linux-gemini/mainline.git
 +S:    Maintained
 +
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  P:    Daniel Ribeiro
  M:    [email protected]
@@@ -521,12 -513,6 +521,12 @@@ L:       [email protected] (sub
  W:    http://www.openezx.org/
  S:    Maintained
  
 +ARM/FARADAY FA526 PORT
 +P:    Paulius Zaleckas
 +M:    [email protected]
 +L:    [email protected] (subscribers-only)
 +S:    Maintained
 +
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
  P:    Sascha Hauer
  M:    [email protected]
@@@ -636,7 -622,7 +636,7 @@@ P: Dirk Opfe
  M:    [email protected]
  S:    Maintained
  
 -ARM/PALMTX SUPPORT
 +ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
  P:    Marek Vasut
  M:    [email protected]
  W:    http://hackndev.com
@@@ -779,14 -765,6 +779,14 @@@ L:       [email protected]
  L:    [email protected]
  S:    Supported
  
 +ATHEROS AR9170 WIRELESS DRIVER
 +P:    Christian Lamparter
 +M:    [email protected]
 +L:    [email protected]
 +W:    http://wireless.kernel.org/en/users/Drivers/ar9170
 +S:    Maintained
 +F:    drivers/net/wireless/ar9170/
 +
  ATI_REMOTE2 DRIVER
  P:    Ville Syrjala
  M:    [email protected]
@@@ -1033,8 -1011,6 +1033,8 @@@ L:      [email protected]
  S:    Supported
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 +P:    Matt Carlson
 +M:    [email protected]
  P:    Michael Chan
  M:    [email protected]
  L:    [email protected]
@@@ -1064,6 -1040,7 +1064,6 @@@ BTTV VIDEO4LINUX DRIVE
  P:    Mauro Carvalho Chehab
  M:    [email protected]
  L:    [email protected]
 -L:    [email protected]
  W:    http://linuxtv.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
@@@ -1292,12 -1269,6 +1292,12 @@@ L:    [email protected]
  T:    git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
  S:    Maintained
  
 +CRYPTOGRAPHIC RANDOM NUMBER GENERATOR
 +P:    Neil Horman
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +
  CS5535 Audio ALSA driver
  P:    Jaya Kumar
  M:    [email protected]
@@@ -1422,11 -1393,6 +1422,11 @@@ P:    Doug Warzech
  M:    [email protected]
  S:    Maintained
  
 +DELL WMI EXTRAS DRIVER
 +P:    Matthew Garrett
 +M:    [email protected]
 +S:    Maintained
 +
  DEVICE NUMBER REGISTRY
  P:    Torben Mathiasen
  M:    [email protected]
@@@ -1544,6 -1510,7 +1544,6 @@@ S:      Maintaine
  DVB SUBSYSTEM AND DRIVERS
  P:    LinuxTV.org Project
  M:    [email protected]
 -L:    [email protected] (subscription required)
  W:    http://linuxtv.org/
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
@@@ -1767,12 -1734,6 +1767,12 @@@ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
 +FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 +P:    Riku Voipio
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +
  FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
  P:    Kristian Hoegsberg, Stefan Richter
  M:    [email protected], [email protected]
@@@ -1955,12 -1916,6 +1955,12 @@@ L:    [email protected]
  W:    http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/
  S:    Maintained
  
 +HYPERVISOR VIRTUAL CONSOLE DRIVER
 +L:    [email protected]
 +L:    [email protected]
 +S:    Odd Fixes
 +F:    drivers/char/hvc_*
 +
  GSPCA FINEPIX SUBDRIVER
  P:    Frank Zago
  M:    [email protected]
@@@ -2218,12 -2173,25 +2218,12 @@@ L:   [email protected]
  T:    quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
  S:    Maintained
  
 -IDE/ATAPI CDROM DRIVER
 +IDE/ATAPI DRIVERS
  P:    Borislav Petkov
  M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
 -IDE/ATAPI FLOPPY DRIVERS
 -P:    Paul Bristow
 -M:    Paul Bristow <[email protected]>
 -W:    http://paulbristow.net/linux/idefloppy.html
 -L:    [email protected]
 -S:    Maintained
 -
 -IDE/ATAPI TAPE DRIVERS
 -P:    Gadi Oxman
 -M:    Gadi Oxman <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -
  IDLE-I7300
  P:    Andy Henroid
  M:    [email protected]
@@@ -2248,11 -2216,6 +2248,11 @@@ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
 +INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 +P:    Mimi Zohar
 +M:    [email protected]
 +S:    Supported
 +
  IMS TWINTURBO FRAMEBUFFER DRIVER
  L:    [email protected] (moderated for non-subscribers)
  S:    Orphan
@@@ -2658,12 -2621,6 +2658,12 @@@ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
 +KMEMTRACE
 +P:    Eduard - Gabriel Munteanu
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +
  KPROBES
  P:    Ananth N Mavinakayanahalli
  M:    [email protected]
@@@ -2875,7 -2832,7 +2875,7 @@@ P:      Roman Zippe
  M:    [email protected]
  L:    [email protected]
  W:    http://www.linux-m68k.org/
 -W:    http://linux-m68k-cvs.ubb.ca/
 +T:    git git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
  S:    Maintained
  
  M68K ON APPLE MACINTOSH
@@@ -2934,12 -2891,6 +2934,12 @@@ M:    [email protected]
  L:    [email protected]
  S:    Supported
  
 +MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 +P:    Nicolas Pitre
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +
  MARVELL YUKON / SYSKONNECT DRIVER
  P:    Mirko Lindner
  M:    [email protected]
@@@ -2992,6 -2943,14 +2992,14 @@@ L:    [email protected]
  T:    git git://git.infradead.org/mtd-2.6.git
  S:    Maintained
  
+ MICROBLAZE ARCHITECTURE
+ P:    Michal Simek
+ M:    [email protected]
+ L:    [email protected]
+ W:    http://www.monstr.eu/fdt/
+ T:    git git://git.monstr.eu/linux-2.6-microblaze.git
+ S:    Supported
+ 
  MICROTEK X6 SCANNER
  P:    Oliver Neukum
  M:    [email protected]
@@@ -3050,14 -3009,13 +3058,14 @@@ S:   Maintaine
  
  MULTIFUNCTION DEVICES (MFD)
  P:    Samuel Ortiz
 -M:    sameo@openedhand.com
 +M:    sameo@linux.intel.com
  L:    [email protected]
 +T:    git kernel.org:/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
  S:    Supported
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  P:    Pierre Ossman
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
@@@ -3127,7 -3085,7 +3135,7 @@@ M:      [email protected]
  L:    [email protected]
  S:    Maintained
  
 -NETERION (S2IO) Xframe 10GbE DRIVER
 +NETERION (S2IO) 10GbE DRIVER (xframe/vxge)
  P:    Ramkrishna Vepa
  M:    [email protected]
  P:    Rastapur Santosh
@@@ -3136,11 -3094,8 +3144,11 @@@ P:    Sivakumar Subraman
  M:    [email protected]
  P:    Sreenivasa Honnur
  M:    [email protected]
 +P:    Anil Murthy
 +M:    [email protected]
  L:    [email protected]
 -W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
 +W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 +W:    http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
  S:    Supported
  
  NETFILTER/IPTABLES/IPCHAINS
@@@ -3244,13 -3199,6 +3252,13 @@@ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
 +NILFS2 FILESYSTEM
 +P:    KONISHI Ryusuke
 +M:    [email protected]
 +L:    [email protected]
 +W:    http://www.nilfs.org/en/
 +S:    Supported
 +
  NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER
  P:    YOKOTA Hiroshi
  M:    [email protected]
@@@ -3349,16 -3297,6 +3357,16 @@@ L:    [email protected]
  W:    http://www.nongnu.org/orinoco/
  S:    Maintained
  
 +OSD LIBRARY
 +P:    Boaz Harrosh
 +M:    [email protected]
 +P:    Benny Halevy
 +M:    [email protected]
 +L:    [email protected]
 +W:    http://open-osd.org
 +T:    git://git.open-osd.org/open-osd.git
 +S:    Maintained
 +
  P54 WIRELESS DRIVER
  P:    Michael Wu
  M:    [email protected]
@@@ -3438,11 -3376,6 +3446,11 @@@ P:    Jim Cromi
  M:    [email protected]
  S:    Maintained
  
 +PCA9532 LED DRIVER
 +P:    Riku Voipio
 +M:    [email protected]
 +S:    Maintained
 +
  PCI ERROR RECOVERY
  P:    Linas Vepstas
  M:    [email protected]
@@@ -3614,22 -3547,6 +3622,22 @@@ M:    [email protected]
  L:    [email protected] (subscribers-only)
  S:    Maintained
  
 +PXA168 SUPPORT
 +P:    Eric Miao
 +M:    [email protected]
 +P:    Jason Chagas
 +M:    [email protected]
 +L:    [email protected] (subscribers-only)
 +T:    git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 +S:    Supported
 +
 +PXA910 SUPPORT
 +P:    Eric Miao
 +M:    [email protected]
 +L:    [email protected] (subscribers-only)
 +T:    git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
 +S:    Supported
 +
  PXA MMCI DRIVER
  S:    Orphan
  
@@@ -3680,7 -3597,7 +3688,7 @@@ S:      Maintaine
  RALINK RT2X00 WIRELESS LAN DRIVER
  P:    rt2x00 project
  L:    [email protected]
 -L:    [email protected]
 +L:    [email protected]
  W:    http://rt2x00.serialmonkey.com/
  S:    Maintained
  T:    git kernel.org:/pub/scm/linux/kernel/git/ivd/rt2x00.git
@@@ -3726,12 -3643,6 +3734,12 @@@ M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
 +RDS - RELIABLE DATAGRAM SOCKETS
 +P:    Andy Grover
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +
  READ-COPY UPDATE (RCU)
  P:    Dipankar Sarma
  M:    [email protected]
@@@ -3823,15 -3734,6 +3831,15 @@@ L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  
 +S390 ZCRYPT DRIVER
 +P:    Felix Beck
 +M:    [email protected]
 +P:    Ralph Wuerthner
 +M:    [email protected]
 +M:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +
  S390 ZFCP DRIVER
  P:    Christof Schmitt
  M:    [email protected]
@@@ -3873,8 -3775,8 +3881,8 @@@ S:      Maintaine
  SCHEDULER
  P:    Ingo Molnar
  M:    [email protected]
 -P:    Robert Love    [the preemptible kernel bits]
 -M:    [email protected]
 +P:    Peter Zijlstra
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
@@@ -3939,15 -3841,8 +3947,15 @@@ S:    Maintaine
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
  P:    Pierre Ossman
 -M:    [email protected]
 -L:    [email protected]
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +
 +SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
 +P:    Anton Vorontsov
 +M:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  
  SECURITY SUBSYSTEM
@@@ -3957,7 -3852,6 +3965,7 @@@ M:      [email protected]
  L:    [email protected]
  L:    [email protected] (suggested Cc:)
  T:    git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
 +W:    http://security.wiki.kernel.org/
  S:    Supported
  
  SECURITY CONTACT
@@@ -4399,22 -4293,12 +4407,22 @@@ L:   [email protected] (su
  W:    http://sourceforge.net/projects/tlan/
  S:    Maintained
  
 -TOSHIBA ACPI EXTRAS DRIVER
 -P:    John Belmonte
 -M:    [email protected]
 -W:    http://memebeam.org/toys/ToshibaAcpiDriver
 +TOMOYO SECURITY MODULE
 +P:    Kentaro Takeda
 +M:    [email protected]
 +P:    Tetsuo Handa
 +M:    [email protected]
 +L:    [email protected] (kernel issues)
 +L:    [email protected] (subscribers-only, for developers and users in English)
 +L:    [email protected] (subscribers-only, for developers in Japanese)
 +L:    [email protected] (subscribers-only, for users in Japanese)
 +W:    http://tomoyo.sourceforge.jp/
 +T:    quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.2.x/tomoyo-lsm/patches/
  S:    Maintained
  
 +TOSHIBA ACPI EXTRAS DRIVER
 +S:    Orphan
 +
  TOSHIBA SMM DRIVER
  P:    Jonathan Buzzard
  M:    [email protected]
@@@ -4422,11 -4306,6 +4430,11 @@@ L:    [email protected]
  W:    http://www.buzzard.org.uk/toshiba/
  S:    Maintained
  
 +TMIO MMC DRIVER
 +P:    Ian Molton
 +M:    [email protected]
 +S:    Maintained
 +
  TPM DEVICE DRIVER
  P:    Debora Velarde
  M:    [email protected]
@@@ -4875,6 -4754,7 +4883,6 @@@ VIDEO FOR LINUX (V4L
  P:    Mauro Carvalho Chehab
  M:    [email protected]
  L:    [email protected]
 -L:    [email protected]
  W:    http://linuxtv.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
  S:    Maintained
@@@ -4891,7 -4771,7 +4899,7 @@@ M:      [email protected]
  P:    Mark Brown
  M:    [email protected]
  W:    http://opensource.wolfsonmicro.com/node/15
 -W:    http://www.slimlogic.co.uk/?page_id=5
 +W:    http://www.slimlogic.co.uk/?p=48
  T:    git kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git
  S:    Supported
  
@@@ -4926,7 -4806,7 +4934,7 @@@ S:      Maintaine
  
  W83L51xD SD/MMC CARD INTERFACE DRIVER
  P:    Pierre Ossman
 -M:    [email protected]
 +M:    [email protected]
  L:    [email protected]
  S:    Maintained
  
@@@ -5013,8 -4893,7 +5021,8 @@@ S:      Supporte
  
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
 -P:    Bill O'Donnell
 +P:    Felix Blyakher
 +M:    [email protected]
  M:    [email protected]
  L:    [email protected]
  W:    http://oss.sgi.com/projects/xfs

diff --combined drivers/serial/Kconfig
index 0328fd4006e52436e0fa49fd3e2a2909572b0c10,131901bfd5db0028eef1ab875af4b3ec284f0c6e..343e3a35b6a37e0b248ad0195610998b8a3b46e5
--- 1/drivers/serial/Kconfig
--- 2/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@@ -533,13 -533,6 +533,13 @@@ config SERIAL_S3C640
          Serial port support for the Samsung S3C6400 and S3C6410
          SoCs
  
 +config SERIAL_MAX3100
 +      tristate "MAX3100 support"
 +      depends on SPI
 +      select SERIAL_CORE
 +      help
 +        MAX3100 chip support
 +
  config SERIAL_DZ
        bool "DECstation DZ serial driver"
        depends on MACH_DECSTATION && 32BIT
@@@ -635,7 -628,7 +635,7 @@@ config SERIAL_MPSC_CONSOL
  
  config SERIAL_PXA
        bool "PXA serial port support"
 -      depends on ARM && ARCH_PXA
 +      depends on ARCH_PXA || ARCH_MMP
        select SERIAL_CORE
        help
          If you have a machine based on an Intel XScale PXA2xx CPU you
@@@ -707,7 -700,7 +707,7 @@@ choic
  
  config SERIAL_BFIN_DMA
        bool "DMA mode"
 -      depends on !DMA_UNCACHED_NONE && !KGDB_UART
 +      depends on !DMA_UNCACHED_NONE && KGDB_SERIAL_CONSOLE=n
        help
          This driver works under DMA mode. If this option is selected, the
          blackfin simple dma driver is also enabled.
@@@ -734,19 -727,19 +734,19 @@@ config BFIN_UART0_CTSRT
  
  config UART0_CTS_PIN
        int "UART0 CTS pin"
 -      depends on BFIN_UART0_CTSRTS
 +      depends on BFIN_UART0_CTSRTS && !BF548
        default 23
        help
          The default pin is GPIO_GP7.
 -        Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
 +        Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
  
  config UART0_RTS_PIN
        int "UART0 RTS pin"
 -      depends on BFIN_UART0_CTSRTS
 +      depends on BFIN_UART0_CTSRTS && !BF548
        default 22
        help
          The default pin is GPIO_GP6.
 -        Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
 +        Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
  
  config SERIAL_BFIN_UART1
        bool "Enable UART1"
@@@ -763,21 -756,21 +763,21 @@@ config BFIN_UART1_CTSRT
  
  config UART1_CTS_PIN
        int "UART1 CTS pin"
 -      depends on BFIN_UART1_CTSRTS && !BF54x
 +      depends on BFIN_UART1_CTSRTS && !BF548
        default -1
        help
 -        Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
 +        Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
  
  config UART1_RTS_PIN
        int "UART1 RTS pin"
 -      depends on BFIN_UART1_CTSRTS && !BF54x
 +      depends on BFIN_UART1_CTSRTS && !BF548
        default -1
        help
 -        Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
 +        Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
  
  config SERIAL_BFIN_UART2
        bool "Enable UART2"
 -      depends on SERIAL_BFIN && (BF54x)
 +      depends on SERIAL_BFIN && (BF54x || BF538 || BF539)
        help
          Enable UART2
  
@@@ -790,17 -783,17 +790,17 @@@ config BFIN_UART2_CTSRT
  
  config UART2_CTS_PIN
        int "UART2 CTS pin"
 -      depends on BFIN_UART2_CTSRTS
 +      depends on BFIN_UART2_CTSRTS && !BF548
        default -1
        help
 -        Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
 +        Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
  
  config UART2_RTS_PIN
        int "UART2 RTS pin"
 -      depends on BFIN_UART2_CTSRTS
 +      depends on BFIN_UART2_CTSRTS && !BF548
        default -1
        help
 -        Refer to ./include/asm-blackfin/gpio.h to see the GPIO map.
 +        Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
  
  config SERIAL_BFIN_UART3
        bool "Enable UART3"
@@@ -815,20 -808,6 +815,20 @@@ config BFIN_UART3_CTSRT
          Enable hardware flow control in the driver. Using GPIO emulate the CTS/RTS
          signal.
  
 +config UART3_CTS_PIN
 +      int "UART3 CTS pin"
 +      depends on BFIN_UART3_CTSRTS && !BF548
 +      default -1
 +      help
 +        Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
 +
 +config UART3_RTS_PIN
 +      int "UART3 RTS pin"
 +      depends on BFIN_UART3_CTSRTS && !BF548
 +      default -1
 +      help
 +        Refer to arch/blackfin/mach-*/include/mach/gpio.h to see the GPIO map.
 +
  config SERIAL_IMX
        bool "IMX serial port support"
        depends on ARM && (ARCH_IMX || ARCH_MXC)
@@@ -854,7 -833,7 +854,7 @@@ config SERIAL_IMX_CONSOL
  
  config SERIAL_UARTLITE
        tristate "Xilinx uartlite serial port support"
-       depends on PPC32
+       depends on PPC32 || MICROBLAZE
        select SERIAL_CORE
        help
          Say Y here if you want to use the Xilinx uartlite serial controller.
@@@ -1340,7 -1319,7 +1340,7 @@@ config SERIAL_NETX_CONSOL
  
  config SERIAL_OF_PLATFORM
        tristate "Serial port on Open Firmware platform bus"
-       depends on PPC_OF
+       depends on PPC_OF || MICROBLAZE
        depends on SERIAL_8250 || SERIAL_OF_PLATFORM_NWPSERIAL
        help
          If you have a PowerPC based system that has serial ports
@@@ -1395,7 -1374,7 +1395,7 @@@ config SERIAL_BFIN_SPOR
        depends on BLACKFIN && EXPERIMENTAL
        select SERIAL_CORE
        help
 -        Enble support SPORT emulate UART on Blackfin series.
 +        Enable SPORT emulate UART on Blackfin series.
  
          To compile this driver as a module, choose M here: the
          module will be called bfin_sport_uart.