This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-camera.dtsi b/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-camera.dtsi | |
index 7139983..f91ddbc 100644 | |
--- a/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-camera.dtsi | |
+++ b/arch/arm/boot/dts/msm8974-g2-vzw/msm8974-g2-vzw-camera.dtsi | |
@@ -22,7 +22,7 @@ | |
qcom,cci-master = <0>; | |
}; | |
- eeprom0: qcom,eeprom@a0 { //EEPROM READ | |
+ eeprom0: qcom,eeprom@a0 { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/arch/arm/mach-msm/Makefile.boot b/arch/arm/mach-msm/Makefile.boot | |
index f7be2f3..2b7b523d 100755 | |
--- a/arch/arm/mach-msm/Makefile.boot | |
+++ b/arch/arm/mach-msm/Makefile.boot | |
@@ -54,40 +54,70 @@ ifeq ($(CONFIG_MACH_LGE),n) | |
dtb-$(CONFIG_ARCH_MSM8974) += msm8974-v1-mtp.dtb | |
dtb-$(CONFIG_ARCH_MSM8974) += msm8974-v1-rumi.dtb | |
dtb-$(CONFIG_ARCH_MSM8974) += msm8974-v1-sim.dtb | |
- dtb-$(CONFIG_ARCH_MSM8974) += msm8974-v2-cdp.dtb | |
- dtb-$(CONFIG_ARCH_MSM8974) += msm8974-v2-fluid.dtb |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On branch aosp | |
Your branch is up-to-date with 'github/cm-11.0'. | |
You have unmerged paths. | |
(fix conflicts and run "git commit") | |
Changes to be committed: | |
modified: Documentation/ABI/testing/sysfs-devices-power | |
modified: Documentation/ABI/testing/sysfs-power |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HEAD detached at f28a8ca | |
You have unmerged paths. | |
(fix conflicts and run "git commit") | |
Changes to be committed: | |
modified: AndroidKernel.mk | |
modified: Documentation/DMA-attributes.txt | |
modified: Documentation/devicetree/bindings/arm/msm/cpr-regulator.txt | |
new file: Documentation/devicetree/bindings/arm/msm/ext-buck-control.txt |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/arch/arm/mach-msm/lge/board-8974-g3-vzw-gpiomux.c b/arch/arm/mach-msm/lge/board-8974-g3-vzw-gpiomux.c | |
index 12c3e2e..fe3a327 100644 | |
--- a/arch/arm/mach-msm/lge/board-8974-g3-vzw-gpiomux.c | |
+++ b/arch/arm/mach-msm/lge/board-8974-g3-vzw-gpiomux.c | |
@@ -72,49 +72,49 @@ static struct gpiomux_setting ap2mdm_wakeup = { | |
}; | |
static struct msm_gpiomux_config mdm_configs[] __initdata = { | |
- /* AP2MDM_STATUS */ | |
+ /* */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Makefile b/Makefile | |
index 9181d08..ceda687 100644 | |
--- a/Makefile | |
+++ b/Makefile | |
@@ -193,8 +193,8 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ | |
# Default value for CROSS_COMPILE is not to prefix executables | |
# Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile | |
export KBUILD_BUILDHOST := $(SUBARCH) | |
-ARCH ?= $(SUBARCH) | |
-CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/configs/media_profiles.xml b/configs/media_profiles.xml | |
index 2306c7c..964db8d 100644 | |
--- a/configs/media_profiles.xml | |
+++ b/configs/media_profiles.xml | |
@@ -1,7 +1,5 @@ | |
<?xml version="1.0" encoding="utf-8"?> | |
-<!-- Copyright (C) 2010 The Android Open Source Project | |
- Copyright (C) 2012-2013 The Linux Foundation. All rights reserved. | |
- Not a contribution. | |
+<!-- Copyright 2013 The Android Open Source Project |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/system/bin/sh | |
# Copyright (c) 2012-2013, The Linux Foundation. All rights reserved. | |
# | |
# Redistribution and use in source and binary forms, with or without | |
# modification, are permitted provided that the following conditions are met: | |
# * Redistributions of source code must retain the above copyright | |
# notice, this list of conditions and the following disclaimer. | |
# * Redistributions in binary form must reproduce the above copyright | |
# notice, this list of conditions and the following disclaimer in the | |
# documentation and/or other materials provided with the distribution. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
/* | |
* Copyright (C) 2014, The CyanogenMod Project | |
* | |
* Licensed under the Apache License, Version 2.0 (the "License"); | |
* you may not use this file except in compliance with the License. | |
* You may obtain a copy of the License at | |
* | |
* http://www.apache.org/licenses/LICENSE-2.0 | |
* | |
* Unless required by applicable law or agreed to in writing, software |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
OLD_LOCAL_PATH := $(LOCAL_PATH) | |
LOCAL_PATH := $(call my-dir) | |
include $(CLEAR_VARS) | |
LOCAL_CFLAGS+= -D_ANDROID_ | |
LOCAL_C_INCLUDES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include | |
LOCAL_C_INCLUDES += $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include/media | |
LOCAL_ADDITIONAL_DEPENDENCIES := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr |