Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into replicant-6.0

1 files changed, 0 insertions, 94 deletions

diff --git a/arch/arm/mvp/commkm/mvp_types.h b/arch/arm/mvp/commkm/mvp_types.h
deleted file mode 100644
index ba5c04c..0000000
--- a/arch/arm/mvp/commkm/mvp_types.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Linux 2.6.32 and later Kernel module for VMware MVP Guest Communications
- *
- * Copyright (C) 2010-2012 VMware, Inc. 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 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.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; see the file COPYING.  If not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-#line 5
-
-/**
- * @file
- *
- * @brief basic type definitions.
- * These may need to be conditionalized for different compilers/platforms.
- */
-
-#ifndef _MVPTYPES_H
-#define _MVPTYPES_H
-
-#define INCLUDE_ALLOW_MVPD
-#define INCLUDE_ALLOW_VMX
-#define INCLUDE_ALLOW_MODULE
-#define INCLUDE_ALLOW_MONITOR
-#define INCLUDE_ALLOW_PV
-#define INCLUDE_ALLOW_HOSTUSER
-#define INCLUDE_ALLOW_GUESTUSER
-#define INCLUDE_ALLOW_WORKSTATION
-#define INCLUDE_ALLOW_GPL
-#include "include_check.h"
-
-typedef unsigned char       uint8;
-typedef unsigned short      uint16;
-typedef unsigned int        uint32;
-typedef unsigned long long  uint64;
-
-typedef signed char         int8;
-typedef short               int16;
-typedef int                 int32;
-typedef long long           int64;
-
-typedef uint32 CVA;      // whatever we are compiling the code as
-typedef uint32 GVA;      // guest virtual addresses
-typedef uint32 MVA;      // monitor virtual addresses
-typedef uint32 HKVA;     // host kernel virtual addresses
-typedef uint32 HUVA;     // host user virtual addresses
-typedef uint64 PA;       // (guest) physical addresses (40-bit)
-typedef uint32 MA;       // (host) machine addresses
-
-typedef uint32 PPN;       // PA/PAGE_SIZE
-typedef uint32 MPN;       // MA/PAGE_SIZE
-
-typedef uint64 cycle_t;
-
-/**
- * @brief Page segment.
- *
- * Specifies a segment within a single page.
- */
-typedef struct {
-   uint16 off;
-   uint16 len;
-} PageSeg;
-
-/*
- * GCC's argument checking for printf-like functions
- *
- * fmtPos is the position of the format string argument, beginning at 1
- * varPos is the position of the variable argument, beginning at 1
- */
-
-#if defined(__GNUC__)
-# define PRINTF_DECL(fmtPos, varPos) __attribute__((__format__(__printf__, fmtPos, varPos)))
-#else
-# define PRINTF_DECL(fmtPos, varPos)
-#endif
-
-#if defined(__GNUC__)
-# define SCANF_DECL(fmtPos, varPos) __attribute__((__format__(__scanf__, fmtPos, varPos)))
-#else
-# define SCANF_DECL(fmtPos, varPos)
-#endif
-
-#endif /* _MVPTYPES_H */