hikey/hikey960: Remove 'discard' mount option mentioned twice

Change-Id: I4272cfda607e509b31a32820c78a5ad97b1a2f49
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
diff --git a/hikey/fstab.hikey-3.18 b/hikey/fstab.hikey-3.18
index ceab636..3a71aba 100644
--- a/hikey/fstab.hikey-3.18
+++ b/hikey/fstab.hikey-3.18
@@ -3,9 +3,9 @@
 # The filesystem that contains the filesystem checker binary (typically /system) cannot
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
-/dev/block/platform/f723d000.dwmmc0/by-name/system      /system             ext4      ro                                                                   wait
-/dev/block/platform/f723d000.dwmmc0/by-name/system      /system             squashfs  ro                                                                   wait
-/dev/block/platform/f723d000.dwmmc0/by-name/cache       /cache              ext4      discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
-/dev/block/platform/f723d000.dwmmc0/by-name/userdata    /data               ext4      discard,noauto_da_alloc,data=ordered,user_xattr,discard,barrier=1    wait
+/dev/block/platform/f723d000.dwmmc0/by-name/system      /system             ext4      ro                                                           wait
+/dev/block/platform/f723d000.dwmmc0/by-name/system      /system             squashfs  ro                                                           wait
+/dev/block/platform/f723d000.dwmmc0/by-name/cache       /cache              ext4      discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
+/dev/block/platform/f723d000.dwmmc0/by-name/userdata    /data               ext4      discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1    wait
 /devices/platform/f723e000.dwmmc1/mmc_host/mmc*                   auto               auto      defaults  voldmanaged=sdcard1:auto,encryptable=userdata
 /devices/platform/f72c0000.usb/usb*               auto               auto      defaults  voldmanaged=usbdisk:auto,encryptable=userdata