diff options
| author | Frederic Weisbecker | 2009-10-18 01:09:09 +0200 |
|---|---|---|
| committer | Frederic Weisbecker | 2009-10-18 01:12:33 +0200 |
| commit | 0f8f86c7bdd1c954fbe153af437a0d91a6c5721a (patch) | |
| tree | 94a8d419a470a4f9852ca397bb9bbe48db92ff5c /drivers/staging/meilhaus/me0600_ext_irq_reg.h | |
| parent | Merge branch 'linus' into tracing/hw-breakpoints (diff) | |
| parent | perf tools: Move dereference after NULL test (diff) | |
| download | kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.gz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.tar.xz kernel-qcow2-linux-0f8f86c7bdd1c954fbe153af437a0d91a6c5721a.zip | |
Merge commit 'perf/core' into perf/hw-breakpoint
Conflicts:
kernel/Makefile
kernel/trace/Makefile
kernel/trace/trace.h
samples/Makefile
Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.
Diffstat (limited to 'drivers/staging/meilhaus/me0600_ext_irq_reg.h')
| -rw-r--r-- | drivers/staging/meilhaus/me0600_ext_irq_reg.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/staging/meilhaus/me0600_ext_irq_reg.h b/drivers/staging/meilhaus/me0600_ext_irq_reg.h deleted file mode 100644 index f6198fa6d2b2..000000000000 --- a/drivers/staging/meilhaus/me0600_ext_irq_reg.h +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @file me0600_ext_irq_reg.h - * - * @brief ME-630 external interrupt register definitions. - * @note Copyright (C) 2007 Meilhaus Electronic GmbH (support@meilhaus.de) - * @author Guenter Gebhardt - */ - -#ifndef _ME0600_EXT_IRQ_REG_H_ -#define _ME0600_EXT_IRQ_REG_H_ - -#ifdef __KERNEL__ - -#define ME0600_INT_0_RESET_REG 0x0005 -#define ME0600_INT_1_RESET_REG 0x0006 - -#endif -#endif |