diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 19:49:28 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 19:49:28 +0200 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /arch/parisc/include/asm/delay.h | |
| parent | rt2x00: do not generate seqno in h/w if QOS is disabled (diff) | |
| parent | NFC: Fix the LLCP Tx fragmentation loop (diff) | |
| download | linux-8065248069097dddf9945acfb2081025e9618c16.tar.xz linux-8065248069097dddf9945acfb2081025e9618c16.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'arch/parisc/include/asm/delay.h')
| -rw-r--r-- | arch/parisc/include/asm/delay.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/delay.h b/arch/parisc/include/asm/delay.h index 7a75e984674b..912ee7e6a579 100644 --- a/arch/parisc/include/asm/delay.h +++ b/arch/parisc/include/asm/delay.h @@ -1,7 +1,7 @@ #ifndef _PARISC_DELAY_H #define _PARISC_DELAY_H -#include <asm/system.h> /* for mfctl() */ +#include <asm/special_insns.h> /* for mfctl() */ #include <asm/processor.h> /* for boot_cpu_data */ |