diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-09 04:55:21 +0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-09 04:55:21 +0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /arch/mn10300/include/asm/setup.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
| download | linux-bbb20089a3275a19e475dbc21320c3742e3ca423.tar.xz | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'arch/mn10300/include/asm/setup.h')
| -rw-r--r-- | arch/mn10300/include/asm/setup.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/setup.h b/arch/mn10300/include/asm/setup.h index 08356c832283..c229d1e3f999 100644 --- a/arch/mn10300/include/asm/setup.h +++ b/arch/mn10300/include/asm/setup.h @@ -11,7 +11,8 @@ #ifndef _ASM_SETUP_H #define _ASM_SETUP_H +#ifdef __KERNEL__ extern void __init unit_setup(void); extern void __init unit_init_IRQ(void); - +#endif #endif /* _ASM_SETUP_H */ |