Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit a80d496d authored Nov 11, 2013 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Nov 11, 2013

Merge "msm: remove include of <asm/mach-types.h> and <asm/system.h>"

parents 867d2a1f f629ba6d

arch/arm/kernel/perf_event_msm.c

+1 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
		* Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -14,7 +14,6 @@
		#include <linux/cpumask.h>
		#include <asm/cp15.h>
		#include <asm/vfp.h>
		#include <asm/system.h>
		#include "../vfp/vfpinstr.h"

		#ifdef CONFIG_CPU_V7

arch/arm/mach-msm/avs.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@

		#include <linux/module.h>
		#include <linux/kernel.h>
		#include <asm/mach-types.h>
		#include <asm/cputype.h>
		#include "avs.h"
		#include "spm.h"

arch/arm/mach-msm/include/mach/socinfo.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@
		#include <linux/of.h>

		#include <asm/cputype.h>
		#include <asm/mach-types.h>
		/*
		* SOC version type with major number in the upper 16 bits and minor
		* number in the lower 16 bits. For example:

arch/arm/mach-msm/keypad-surf-ffa.c

+1 −3

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 Google, Inc.
		* Copyright (c) 2008-2009, The Linux Foundation. All rights reserved.
		* Copyright (c) 2008-2009, 2013, The Linux Foundation. All rights reserved.
		* Author: Brian Swetland <swetland@google.com>
		*
		* This software is licensed under the terms of the GNU General Public
		@@ -17,8 +17,6 @@
		#include <linux/platform_device.h>
		#include <linux/gpio_event.h>

		#include <asm/mach-types.h>

		/* don't turn this on without updating the ffa support */
		#define SCAN_FUNCTION_KEYS 0

arch/arm/mach-msm/mdm2.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		#include <linux/completion.h>
		#include <linux/workqueue.h>
		#include <linux/clk.h>
		#include <asm/mach-types.h>
		#include <mach/mdm2.h>
		#include <mach/restart.h>
		#include <mach/subsystem_notif.h>