diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-11 08:19:09 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-11 08:19:09 -0400 |
| commit | 89034bc2c7b839702c00a704e79d112737f98be0 (patch) | |
| tree | e65b1f3d4c751baa840efc81bc4734f089379eb3 /arch/blackfin/mach-bf561/include/mach/anomaly.h | |
| parent | fb82ad719831db58e9baa4c67015aae3fe27e7e3 (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'linus' into tracing/core
Conflicts:
kernel/trace/trace_events_filter.c
We use the tracing/core version.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/mach-bf561/include/mach/anomaly.h')
| -rw-r--r-- | arch/blackfin/mach-bf561/include/mach/anomaly.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf561/include/mach/anomaly.h b/arch/blackfin/mach-bf561/include/mach/anomaly.h index 94b8e277f09d..a5312b2d267e 100644 --- a/arch/blackfin/mach-bf561/include/mach/anomaly.h +++ b/arch/blackfin/mach-bf561/include/mach/anomaly.h | |||
| @@ -288,6 +288,7 @@ | |||
| 288 | #define ANOMALY_05000273 (0) | 288 | #define ANOMALY_05000273 (0) |
| 289 | #define ANOMALY_05000311 (0) | 289 | #define ANOMALY_05000311 (0) |
| 290 | #define ANOMALY_05000353 (1) | 290 | #define ANOMALY_05000353 (1) |
| 291 | #define ANOMALY_05000364 (0) | ||
| 291 | #define ANOMALY_05000380 (0) | 292 | #define ANOMALY_05000380 (0) |
| 292 | #define ANOMALY_05000386 (1) | 293 | #define ANOMALY_05000386 (1) |
| 293 | #define ANOMALY_05000389 (0) | 294 | #define ANOMALY_05000389 (0) |