diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:32:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 17:32:04 +1000 |
| commit | 1a4072a95e8f79c2e52aed795e0e54428b0f31fc (patch) | |
| tree | 6e7aa0663141156aa8fd57c8120a0aa76daf8d66 /drivers/staging/meilhaus/meids.h | |
| parent | 111a3b94375ee87535ac985de4c94be5e5634881 (diff) | |
| parent | c0e03fabb4f2a6e48f6e0b55729b26a599a2bd02 (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/at76_usb/at76_usb.c
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/meilhaus/meids.h')
| -rw-r--r-- | drivers/staging/meilhaus/meids.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/staging/meilhaus/meids.h b/drivers/staging/meilhaus/meids.h deleted file mode 100644 index b3e757cbdda6..000000000000 --- a/drivers/staging/meilhaus/meids.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2005 Meilhaus Electronic GmbH (support@meilhaus.de) - * - * Source File : meids.h - * Author : GG (Guenter Gebhardt) <g.gebhardt@meilhaus.de> - */ - -#ifndef _MEIDS_H_ -#define _MEIDS_H_ - -#ifdef __KERNEL__ - -/*============================================================================= - Driver names - ===========================================================================*/ - -#define MEMAIN_NAME "memain" -#define ME1000_NAME "me1000" -#define ME1400_NAME "me1400" -#define ME1600_NAME "me1600" -#define ME4600_NAME "me4600" -#define ME6000_NAME "me6000" -#define ME0600_NAME "me0600" //"me630" -#define ME8100_NAME "me8100" -#define ME8200_NAME "me8200" -#define ME0900_NAME "me0900" //"me9x" -//#define MEPHISTO_S1_NAME "mephisto_s1" -#define MEDUMMY_NAME "medummy" - -#endif -#endif |