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/meilhaus/meids.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/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 b3e757c..0000000 --- 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 |