Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / arch / blackfin / mach-bf548 / Kconfig

diff --git a/arch/blackfin/mach-bf548/Kconfig b/arch/blackfin/mach-bf548/Kconfig
index e78b03d56c7c9ad3c7c9db4335acd10d423f3d89..d8bd3b49f150275cf5e32ccbd0c0cfbf648d4e65 100644 (file)
--- a/arch/blackfin/mach-bf548/Kconfig
+++ b/arch/blackfin/mach-bf548/Kconfig
@@ -1,7 +1,16 @@
 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
+       help
+         Treat any DEB1, DEB2 and DEB3 request as Urgent
+
 comment "Interrupt Priority Assignment"
 menu "Priority"
 
@@ -282,7 +291,7 @@ menu "Assignment"
 
 config PINTx_REASSIGN
        bool "Reprogram PINT Assignment"
-       default n
+       default y
        help
          The interrupt assignment registers controls the pin-to-interrupt
          assignment in a byte-wide manner. Each option allows you to select
@@ -303,7 +312,7 @@ config PINT1_ASSIGN
 config PINT2_ASSIGN
        hex "PINT2_ASSIGN"
        depends on PINTx_REASSIGN
-       default 0x00000101
+       default 0x07000101
 config PINT3_ASSIGN
        hex "PINT3_ASSIGN"
        depends on PINTx_REASSIGN