Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220239
b: refs/heads/master
c: f1d0fe0
h: refs/heads/master
i:
  220237: e1781c3
  220235: 1e21e35
  220231: 46b8dc8
  220223: e2eacef
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Oct 8, 2010
1 parent 68f0314 commit d186c34
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3e26416e2f7fc2781c084c4ea51227aef30336de
refs/heads/master: f1d0fe0abc2c7643dee6df5ed473d3f1b0e15a97
22 changes: 1 addition & 21 deletions trunk/drivers/staging/brcm80211/include/typedefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,16 @@

#include <linux/types.h>

/*
* Infer the compile environment based on preprocessor symbols and pragmas.
* Override type definitions as needed, and include configuration-dependent
* header files to define types.
*/

#if defined(__x86_64__)
#define TYPEDEF_UINTPTR
typedef unsigned long long int uintptr;
#endif

#define TYPEDEF_UINT

/*
* Default Typedefs
*/

/* define uint */

#ifndef TYPEDEF_UINT
typedef unsigned int uint;
#endif

#ifndef TYPEDEF_UINTPTR
typedef unsigned int uintptr;
#endif

/* define macro values */
#undef TYPEDEF_UINTPTR

#ifndef FALSE
#define FALSE 0
Expand All @@ -66,8 +48,6 @@ typedef unsigned int uintptr;

#define AUTO (-1) /* Auto = -1 */

#undef TYPEDEF_UINT
#undef TYPEDEF_UINTPTR

/*
* Including the bcmdefs.h here, to make sure everyone including typedefs.h
Expand Down

0 comments on commit d186c34

Please sign in to comment.