diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 10:57:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 10:57:40 -0700 |
commit | 59f2fe326666002f8387fb434a871815d3535f40 (patch) | |
tree | 4808568861b1a1ec501c89476a105f14acb24818 /arch/s390/kernel/perf_event.c | |
parent | 307cc7904841fd66a848ece16a179b49ae1a4ba4 (diff) | |
parent | 1e3cab2f2fbca25289094698fd1280ecfad7a8d4 (diff) | |
download | blackbird-op-linux-59f2fe326666002f8387fb434a871815d3535f40.tar.gz blackbird-op-linux-59f2fe326666002f8387fb434a871815d3535f40.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 build fixes from Martin Schwidefsky.
More small fixes for the system.h disintegration.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
[S390] Fix build errors (fallout from system.h disintegration)
Diffstat (limited to 'arch/s390/kernel/perf_event.c')
-rw-r--r-- | arch/s390/kernel/perf_event.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/kernel/perf_event.c b/arch/s390/kernel/perf_event.c index 609f985198cf..f58f37f66824 100644 --- a/arch/s390/kernel/perf_event.c +++ b/arch/s390/kernel/perf_event.c @@ -15,7 +15,6 @@ #include <linux/perf_event.h> #include <linux/percpu.h> #include <linux/export.h> -#include <asm/system.h> #include <asm/irq.h> #include <asm/cpu_mf.h> #include <asm/lowcore.h> |