From c8083b0995fab77d4d56650fb5f7846dd96bf35b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 15 Aug 2013 08:52:55 +0530
Subject: [PATCH] Move non upstream change out of upstream file

---
 src/calibre/devices/mtp/unix/devices.c                | 3 +++
 src/calibre/devices/mtp/unix/upstream/music-players.h | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/calibre/devices/mtp/unix/devices.c b/src/calibre/devices/mtp/unix/devices.c
index 2efe02c38f..8738f210d5 100644
--- a/src/calibre/devices/mtp/unix/devices.c
+++ b/src/calibre/devices/mtp/unix/devices.c
@@ -11,6 +11,9 @@
 const calibre_device_entry_t calibre_mtp_device_table[] = {
 #include "upstream/music-players.h"
 
+  { "Acer", 0x0502, "MT65xx Android Phone", 0x353c,
+      DEVICE_FLAGS_ANDROID_BUGS },
+
     , { NULL, 0xffff, NULL, 0xffff, DEVICE_FLAG_NONE }
 };
 
diff --git a/src/calibre/devices/mtp/unix/upstream/music-players.h b/src/calibre/devices/mtp/unix/upstream/music-players.h
index f0e175cb70..fedda128aa 100644
--- a/src/calibre/devices/mtp/unix/upstream/music-players.h
+++ b/src/calibre/devices/mtp/unix/upstream/music-players.h
@@ -580,8 +580,6 @@
       DEVICE_FLAGS_ANDROID_BUGS },
   { "Acer", 0x0502, "Liquid Z120 MT65xx Android Phone", 0x3473,
       DEVICE_FLAGS_ANDROID_BUGS },
-  { "Acer", 0x0502, "MT65xx Android Phone", 0x353c,
-      DEVICE_FLAGS_ANDROID_BUGS },
 
   /*
    * SanDisk