Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update arch/arm/mach-msm/board-htcleo.c

Fixed git merge failure
  • Loading branch information...
commit 93a7e65212679a1eeb5a1ea042b3a057a13cbde5 1 parent 9f0185b
@einsteinecker authored
Showing with 2 additions and 13 deletions.
  1. +2 −13 arch/arm/mach-msm/board-htcleo.c
View
15 arch/arm/mach-msm/board-htcleo.c
@@ -51,12 +51,7 @@
#include <mach/msm_hsusb.h>
#include <mach/msm_battery.h>
#include <mach/perflock.h>
-<<<<<<< HEAD
#include <mach/rpc_hsusb.h>
-=======
-#include <mach/htc_battery.h>
-#include <mach/htc_usb.h>
->>>>>>> upstream/master
#include <mach/msm_flashlight.h>
#include <mach/msm_serial_hs.h>
#ifdef CONFIG_SERIAL_BCM_BT_LPM
@@ -767,7 +762,6 @@ static struct platform_device ram_console_device = {
.num_resources = ARRAY_SIZE(ram_console_resources),
.resource = ram_console_resources,
};
-<<<<<<< HEAD
///////////////////////////////////////////////////////////////////////
// Power/Battery
///////////////////////////////////////////////////////////////////////
@@ -781,8 +775,6 @@ static struct platform_device htcleo_battery = {
.name = "htcleo_battery",
.id = -1,
};
-=======
->>>>>>> upstream/master
///////////////////////////////////////////////////////////////////////
// Real Time Clock
@@ -842,11 +834,8 @@ static struct platform_device *devices[] __initdata =
&android_pmem_adsp_device,
&android_pmem_venc_device,
&msm_device_i2c,
-<<<<<<< HEAD
-=======
-// &htc_battery_pdev,
->>>>>>> upstream/master
&msm_kgsl_device,
+// &msm_camera_sensor_s5k3e2fx,
// &htcleo_flashlight_device,
// &htc_headset_mgr,
// &htc_headset_gpio,
@@ -1088,4 +1077,4 @@ MACHINE_START(HTCLEO, "htcleo")
.init_irq = msm_init_irq,
.init_machine = htcleo_init,
.timer = &msm_timer,
-MACHINE_END
+MACHINE_END
Please sign in to comment.
Something went wrong with that request. Please try again.