Merge branch 'master' into tk71

[mv-sheeva.git] / arch / blackfin / mach-bf537 / Kconfig

diff --git a/arch/blackfin/mach-bf537/Kconfig b/arch/blackfin/mach-bf537/Kconfig
index d81224f9d723d0f8e3b27ea8d558ec1389e77f1f..08b2b343ccecdfd825de3e3b35faf6bc3f71072c 100644 (file)
--- a/arch/blackfin/mach-bf537/Kconfig
+++ b/arch/blackfin/mach-bf537/Kconfig
@@ -14,8 +14,8 @@ config IRQ_DMA_ERROR
        int "IRQ_DMA_ERROR Generic"
        default 7
 config IRQ_ERROR
-       int "IRQ_ERROR: CAN MAC SPORT0 SPORT1 SPI UART0 UART1"
-       default 7
+       int "IRQ_ERROR: PPI CAN MAC SPORT0 SPORT1 SPI UART0 UART1"
+       default 11
 config IRQ_RTC
        int "IRQ_RTC"
        default 8