Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[linux-2.6-omap-h63xx.git] / arch / blackfin / mach-bf548 / Kconfig

diff --git a/arch/blackfin/mach-bf548/Kconfig b/arch/blackfin/mach-bf548/Kconfig
index 08d8dc83701c3e7cb3d279f757358155fba662f7..dcf657159051cfd8a1fb34714ea3586ba6bff5c4 100644 (file)
--- a/arch/blackfin/mach-bf548/Kconfig
+++ b/arch/blackfin/mach-bf548/Kconfig
@@ -1,11 +1,13 @@
 if (BF54x)
 
+source "arch/blackfin/mach-bf548/boards/Kconfig"
+
 menu "BF548 Specific Configuration"
 
 config DEB_DMA_URGENT
        bool "DMA has priority over core for ext. accesses"
        depends on BF54x
-       default n
+       default y
        help
          Treat any DEB1, DEB2 and DEB3 request as Urgent
 
@@ -248,7 +250,7 @@ config IRQ_OTPSEC
        default 11
 config IRQ_TIMER0
        int "IRQ_TIMER0"
-       default 11
+       default 8
 config IRQ_TIMER1
        int "IRQ_TIMER1"
        default 11