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

Commit 2c8cebd2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-soc-for-4.9' of... 

Merge tag 'qcom-soc-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc

Pull "Qualcomm ARM Based SoC Updates for v4.9" from Andy Gross:

* Remove unnecessary QCOM board file

* tag 'qcom-soc-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: qcom: Cleanup/Remove unnecessary board file
parents a2fccdea 80483c3a

arch/arm/mach-qcom/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-y			:= board.o

obj-$(CONFIG_SMP)	+= platsmp.o

arch/arm/mach-qcom/board.c

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/* Copyright (c) 2010-2014 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/init.h>



#include <asm/mach/arch.h>



static const char * const qcom_dt_match[] __initconst = {

	"qcom,apq8064",

	"qcom,apq8074-dragonboard",

	"qcom,apq8084",

	"qcom,ipq8062",

	"qcom,ipq8064",

	"qcom,msm8660-surf",

	"qcom,msm8960-cdp",

	"qcom,mdm9615",

	NULL

};



DT_MACHINE_START(QCOM_DT, "Qualcomm (Flattened Device Tree)")

	.dt_compat = qcom_dt_match,

MACHINE_END