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/arm/mach-omap2/sleep44xx.S | |
| 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/arm/mach-omap2/sleep44xx.S')
| -rw-r--r-- | arch/arm/mach-omap2/sleep44xx.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/sleep44xx.S b/arch/arm/mach-omap2/sleep44xx.S index abd283400490..9f6b83d1b193 100644 --- a/arch/arm/mach-omap2/sleep44xx.S +++ b/arch/arm/mach-omap2/sleep44xx.S @@ -10,7 +10,6 @@ */ #include <linux/linkage.h> -#include <asm/system.h> #include <asm/smp_scu.h> #include <asm/memory.h> #include <asm/hardware/cache-l2x0.h> |