diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 17:45:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 17:45:39 +0100 |
| commit | de0a5345a55b8dd5a4695181275df0e691176830 (patch) | |
| tree | 17530e824f7f46ce0b1757657179fb5957a6add5 /arch/um/include/asm/percpu.h | |
| parent | Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc (diff) | |
| parent | um: fix ubd cow size (diff) | |
| download | linux-de0a5345a55b8dd5a4695181275df0e691176830.tar.xz linux-de0a5345a55b8dd5a4695181275df0e691176830.zip | |
Merge branch 'for-linus' of git://github.com/richardweinberger/linux
* 'for-linus' of git://github.com/richardweinberger/linux: (90 commits)
um: fix ubd cow size
um: Fix kmalloc argument order in um/vdso/vma.c
um: switch to use of drivers/Kconfig
UserModeLinux-HOWTO.txt: fix a typo
UserModeLinux-HOWTO.txt: remove ^H characters
um: we need sys/user.h only on i386
um: merge delay_{32,64}.c
um: distribute exports to where exported stuff is defined
um: kill system-um.h
um: generic ftrace.h will do...
um: segment.h is x86-only and needed only there
um: asm/pda.h is not needed anymore
um: hw_irq.h can go generic as well
um: switch to generic-y
um: clean Kconfig up a bit
um: a couple of missing dependencies...
um: kill useless argument of free_chan() and free_one_chan()
um: unify ptrace_user.h
um: unify KSTK_...
um: fix gcov build breakage
...
Diffstat (limited to 'arch/um/include/asm/percpu.h')
| -rw-r--r-- | arch/um/include/asm/percpu.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/um/include/asm/percpu.h b/arch/um/include/asm/percpu.h deleted file mode 100644 index efe7508d8abd..000000000000 --- a/arch/um/include/asm/percpu.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __UM_PERCPU_H -#define __UM_PERCPU_H - -#include <asm-generic/percpu.h> - -#endif /* __UM_PERCPU_H */ |