diff options
author | 2009-09-19 11:27:32 +0200 | |
---|---|---|
committer | 2009-09-19 11:28:41 +0200 | |
commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
tree | 739063990a8077b29ef97e69d73bce94573daae4 /drivers/staging/meilhaus/me4600_ext_irq_reg.h | |
parent | sched_clock: Make it NMI safe (diff) | |
parent | pty_write: don't do a tty_wakeup() when the buffers are full (diff) | |
download | linux-dev-929bf0d0156562ce631728b6fa53d68004d456d2.tar.xz linux-dev-929bf0d0156562ce631728b6fa53d68004d456d2.zip |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/staging/meilhaus/me4600_ext_irq_reg.h')
-rw-r--r-- | drivers/staging/meilhaus/me4600_ext_irq_reg.h | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/drivers/staging/meilhaus/me4600_ext_irq_reg.h b/drivers/staging/meilhaus/me4600_ext_irq_reg.h deleted file mode 100644 index 898e1e74d9e7..000000000000 --- a/drivers/staging/meilhaus/me4600_ext_irq_reg.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file me4600_ext_irq_reg.h - * - * @brief ME-4000 external interrupt subdevice register definitions. - * @note Copyright (C) 2007 Meilhaus Electronic GmbH (support@meilhaus.de) - * @author Guenter Gebhardt - */ - -/* - * Copyright (C) 2007 Meilhaus Electronic GmbH (support@meilhaus.de) - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef _ME4600_EXT_IRQ_REG_H_ -#define _ME4600_EXT_IRQ_REG_H_ - -#ifdef __KERNEL__ - -#define ME4600_EXT_IRQ_CONFIG_REG 0xCC // R/_ -#define ME4600_EXT_IRQ_VALUE_REG 0xD0 // R/_ - -#define ME4600_EXT_IRQ_CONFIG_MASK_RISING 0x0 -#define ME4600_EXT_IRQ_CONFIG_MASK_FALLING 0x1 -#define ME4600_EXT_IRQ_CONFIG_MASK_ANY 0x3 -#define ME4600_EXT_IRQ_CONFIG_MASK 0x3 - -#endif -#endif |