diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-26 19:13:19 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-26 19:13:19 +0200 |
| commit | c226951b93f7cd7c3a10b17384535b617bd43fd0 (patch) | |
| tree | 07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e /arch/frv/kernel/setup.c | |
| parent | Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linv... (diff) | |
| parent | [PATCH] s390: fix cmm kernel thread handling (diff) | |
| download | linux-c226951b93f7cd7c3a10b17384535b617bd43fd0.tar.xz linux-c226951b93f7cd7c3a10b17384535b617bd43fd0.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/frv/kernel/setup.c')
| -rw-r--r-- | arch/frv/kernel/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index af08ccd4ed6e..d96a57e5f030 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c @@ -43,7 +43,6 @@ #include <asm/mb-regs.h> #include <asm/mb93493-regs.h> #include <asm/gdb-stub.h> -#include <asm/irq-routing.h> #include <asm/io.h> #ifdef CONFIG_BLK_DEV_INITRD |