diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-19 17:51:42 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-05-19 17:51:42 +1000 |
| commit | 9c34ad2933910aa02e387e161845fb64cad3b002 (patch) | |
| tree | ef357700575b0fb1f2cb707dec6f8b3cbf669b22 /drivers/staging/heci/heci_data_structures.h | |
| parent | 1e4467c780b7b7639bf3d713dc49a1a3b875c7c5 (diff) | |
| parent | 48b83441aa08a72bb579872d2bf21734b0a26ce2 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/rt2860/common/mlme.c
drivers/staging/rt2870/common/mlme.c
drivers/staging/rt3070/common/mlme.c
Diffstat (limited to 'drivers/staging/heci/heci_data_structures.h')
| -rw-r--r-- | drivers/staging/heci/heci_data_structures.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/heci/heci_data_structures.h b/drivers/staging/heci/heci_data_structures.h index 575e8f8e88a3..ff30386d097a 100644 --- a/drivers/staging/heci/heci_data_structures.h +++ b/drivers/staging/heci/heci_data_structures.h @@ -41,7 +41,6 @@ #ifndef _HECI_DATA_STRUCTURES_H_ #define _HECI_DATA_STRUCTURES_H_ -#include <linux/version.h> #include <linux/spinlock.h> #include <linux/list.h> #include <linux/pci.h> |