diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 21:47:41 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 21:47:41 +0100 |
| commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
| tree | bc16200f3b6ea150b298422754e32959eaa339bc /arch/powerpc/include/asm/xics.h | |
| parent | driver: pcmcia: replace IRQ_GPIO() with gpio_to_irq() (diff) | |
| parent | macb: allow GEM to have configurable receive buffer size (diff) | |
| download | linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.tar.xz linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.zip | |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'arch/powerpc/include/asm/xics.h')
| -rw-r--r-- | arch/powerpc/include/asm/xics.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/xics.h b/arch/powerpc/include/asm/xics.h index bd6c401c0ee5..c48de98ba94e 100644 --- a/arch/powerpc/include/asm/xics.h +++ b/arch/powerpc/include/asm/xics.h @@ -15,8 +15,8 @@ #define DEFAULT_PRIORITY 5 /* - * Mark IPIs as higher priority so we can take them inside interrupts that - * arent marked IRQF_DISABLED + * Mark IPIs as higher priority so we can take them inside interrupts + * FIXME: still true now? */ #define IPI_PRIORITY 4 |