From 6e960fdd33600f7e0b2a76e5454f8f53fcb4d2cc Mon Sep 17 00:00:00 2001 From: Dmitri Vorobiev Date: Thu, 24 Jan 2008 19:52:54 +0300 Subject: [PATCH] --- yaml --- r: 78074 b: refs/heads/master c: cd80d548594aae0ee915e01050279399cb14943b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/mips-boards/malta/malta_int.c | 3 ++- trunk/arch/mips/mips-boards/malta/malta_setup.c | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index be8fdd67a7bd..4e5726c65374 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bbdda5e1fe9c1a5b34a2b552910f5f4c0dc24485 +refs/heads/master: cd80d548594aae0ee915e01050279399cb14943b diff --git a/trunk/arch/mips/mips-boards/malta/malta_int.c b/trunk/arch/mips/mips-boards/malta/malta_int.c index 92e6e2d7b7f3..dbe60eb55e29 100644 --- a/trunk/arch/mips/mips-boards/malta/malta_int.c +++ b/trunk/arch/mips/mips-boards/malta/malta_int.c @@ -114,7 +114,8 @@ static void malta_hw0_irqdispatch(void) irq = get_int(); if (irq < 0) { - return; /* interrupt has already been cleared */ + /* interrupt has already been cleared */ + return; } do_IRQ(MALTA_INT_BASE + irq); diff --git a/trunk/arch/mips/mips-boards/malta/malta_setup.c b/trunk/arch/mips/mips-boards/malta/malta_setup.c index 8dacb6adb6db..8d62966dcabb 100644 --- a/trunk/arch/mips/mips-boards/malta/malta_setup.c +++ b/trunk/arch/mips/mips-boards/malta/malta_setup.c @@ -202,9 +202,8 @@ void __init plat_mem_setup(void) #endif } #ifdef CONFIG_DMA_COHERENT - else { + else panic("Hardware DMA cache coherency not supported"); - } #endif #ifdef CONFIG_BLK_DEV_IDE