git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
arch
/
blackfin
/
mach-bf537
/
Kconfig
diff --git
a/arch/blackfin/mach-bf537/Kconfig
b/arch/blackfin/mach-bf537/Kconfig
index
d81224f
..
08b2b34
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