diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-25 17:36:02 +0100 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-10-25 17:36:02 +0100 |
commit | 456ba5a7802e58eccb5aa9751b3ab515ef99b9ca (patch) | |
tree | 4ca4dd3726b34dead51af13b67475af7bf857893 /arch/xtensa/include/asm/irq_regs.h | |
parent | 05304949332c6d2c7b50f2d0f666a52369f09ced (diff) | |
parent | 79748cdb39dbf914bc5f26c75cfd5f91d84d82c9 (diff) | |
download | linux-456ba5a7802e58eccb5aa9751b3ab515ef99b9ca.tar.bz2 |
Merge remote-tracking branches 'asoc/fix/ux500' and 'asoc/fix/wm8994' into for-3.7
Diffstat (limited to 'arch/xtensa/include/asm/irq_regs.h')
-rw-r--r-- | arch/xtensa/include/asm/irq_regs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/xtensa/include/asm/irq_regs.h b/arch/xtensa/include/asm/irq_regs.h deleted file mode 100644 index 3dd9c0b70270..000000000000 --- a/arch/xtensa/include/asm/irq_regs.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/irq_regs.h> |