Staging: rt{28,30}70: merge rt{28,30}70/*.[ch]

[pandora-kernel.git] / drivers / staging / rt3070 / rtmp_type.h

diff --git a/drivers/staging/rt3070/rtmp_type.h b/drivers/staging/rt3070/rtmp_type.h
index 4e4b168..42384e5 100644 (file)
--- a/drivers/staging/rt3070/rtmp_type.h
+++ b/drivers/staging/rt3070/rtmp_type.h
@@ -1,95 +1 @@
-/*
- *************************************************************************
- * Ralink Tech Inc.
- * 5F., No.36, Taiyuan St., Jhubei City,
- * Hsinchu County 302,
- * Taiwan, R.O.C.
- *
- * (c) Copyright 2002-2007, Ralink Technology, Inc.
- *
- * This program is free software; you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation; either version 2 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * 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; if not, write to the                         *
- * Free Software Foundation, Inc.,                                       *
- * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- *                                                                       *
- *************************************************************************
-
-    Module Name:
-    rtmp_type.h
-
-    Abstract:
-
-    Revision History:
-    Who         When            What
-    --------    ----------      ----------------------------------------------
-    Name        Date            Modification logs
-    Paul Lin    1-2-2004
-*/
-#ifndef __RTMP_TYPE_H__
-#define __RTMP_TYPE_H__
-
-
-#define PACKED  __attribute__ ((packed))
-
-// Put platform dependent declaration here
-// For example, linux type definition
-typedef unsigned char          UINT8;
-typedef unsigned short         UINT16;
-typedef unsigned int           UINT32;
-typedef unsigned long long     UINT64;
-typedef int                                    INT32;
-typedef long long                      INT64;
-
-typedef unsigned char *                        PUINT8;
-typedef unsigned short *               PUINT16;
-typedef unsigned int *                 PUINT32;
-typedef unsigned long long *   PUINT64;
-typedef int    *                                       PINT32;
-typedef long long *                    PINT64;
-
-typedef signed char                    CHAR;
-typedef signed short           SHORT;
-typedef signed int                     INT;
-typedef signed long                    LONG;
-typedef signed long long       LONGLONG;
-
-
-typedef unsigned char          UCHAR;
-typedef unsigned short         USHORT;
-typedef unsigned int           UINT;
-typedef unsigned long          ULONG;
-typedef unsigned long long     ULONGLONG;
-
-typedef unsigned char          BOOLEAN;
-typedef void                           VOID;
-
-typedef VOID *                         PVOID;
-typedef CHAR *                         PCHAR;
-typedef UCHAR *                        PUCHAR;
-typedef USHORT *                       PUSHORT;
-typedef LONG *                         PLONG;
-typedef ULONG *                                PULONG;
-typedef UINT *                         PUINT;
-
-typedef unsigned int   NDIS_MEDIA_STATE;
-
-typedef union _LARGE_INTEGER {
-    struct {
-        UINT LowPart;
-        INT32 HighPart;
-    } u;
-    INT64 QuadPart;
-} LARGE_INTEGER;
-
-#endif  // __RTMP_TYPE_H__
-
+#include "../rt2870/rtmp_type.h"