diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/vt6655/device_cfg.h | |
parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/vt6655/device_cfg.h')
-rw-r--r-- | drivers/staging/vt6655/device_cfg.h | 46 |
1 files changed, 6 insertions, 40 deletions
diff --git a/drivers/staging/vt6655/device_cfg.h b/drivers/staging/vt6655/device_cfg.h index 1cbb444..d1e9c19 100644 --- a/drivers/staging/vt6655/device_cfg.h +++ b/drivers/staging/vt6655/device_cfg.h @@ -1,5 +1,6 @@ /* - * Copyright (c) 1996, 2003 VIA Networking, Inc. All rights reserved. + * Copyright (c) 1996, 2003 VIA Networking Technologies, 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 as published by @@ -15,7 +16,6 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * * File: device_cfg.h * * Purpose: Driver configuration header @@ -30,46 +30,13 @@ //#include <linux/config.h> #include <linux/types.h> -#if !defined(__TTYPE_H__) #include "ttype.h" -#endif - - - -typedef __u8 UINT8, *PUINT8; -typedef __u16 UINT16, *PUINT16; -typedef __u32 UINT32, *PUINT32; - - -#ifndef VOID -#define VOID void -#endif - -#ifndef CONST -#define CONST const -#endif - -#ifndef STATIC -#define STATIC static -#endif - -#ifndef DEF -#define DEF -#endif - -#ifndef IN -#define IN -#endif - -#ifndef OUT -#define OUT -#endif typedef struct _version { - UINT8 major; - UINT8 minor; - UINT8 build; + unsigned char major; + unsigned char minor; + unsigned char build; } version_t, *pversion_t; #ifndef FALSE @@ -100,6 +67,7 @@ struct _version { #ifndef DEVICE_VERSION #define DEVICE_VERSION "1.19.12" #endif + //config file #include <linux/fs.h> #include <linux/fcntl.h> @@ -111,8 +79,6 @@ struct _version { #define PKT_BUF_SZ 2390 -#define MALLOC(x,y) kmalloc((x),(y)) -#define FREE(x) kfree((x)) #define MAX_UINTS 8 #define OPTION_DEFAULT { [0 ... MAX_UINTS-1] = -1} |