diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:25:28 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-08-08 06:26:15 -0400 |
| commit | a131bc185528331451a93db6c50a7d2070376a61 (patch) | |
| tree | 18cccd206d4835ee8df147ac3b0c0e30cc00680d /arch/blackfin/mach-bf538/include/mach/anomaly.h | |
| parent | 19943b0e30b05d42e494ae6fef78156ebc8c637e (diff) | |
| parent | ff1649ff780fb7c0bfbf42d05ffc9b56336b9aa3 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Pull fixes in from 2.6.31 so that people testing the iommu-2.6.git tree
no longer trip over bugs which were already fixed (sorry, Horms).
Diffstat (limited to 'arch/blackfin/mach-bf538/include/mach/anomaly.h')
| -rw-r--r-- | arch/blackfin/mach-bf538/include/mach/anomaly.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf538/include/mach/anomaly.h b/arch/blackfin/mach-bf538/include/mach/anomaly.h index c97acdf85cd3..451cf8a82a42 100644 --- a/arch/blackfin/mach-bf538/include/mach/anomaly.h +++ b/arch/blackfin/mach-bf538/include/mach/anomaly.h | |||
| @@ -137,6 +137,7 @@ | |||
| 137 | #define ANOMALY_05000158 (0) | 137 | #define ANOMALY_05000158 (0) |
| 138 | #define ANOMALY_05000171 (0) | 138 | #define ANOMALY_05000171 (0) |
| 139 | #define ANOMALY_05000182 (0) | 139 | #define ANOMALY_05000182 (0) |
| 140 | #define ANOMALY_05000189 (0) | ||
| 140 | #define ANOMALY_05000198 (0) | 141 | #define ANOMALY_05000198 (0) |
| 141 | #define ANOMALY_05000202 (0) | 142 | #define ANOMALY_05000202 (0) |
| 142 | #define ANOMALY_05000215 (0) | 143 | #define ANOMALY_05000215 (0) |
| @@ -160,6 +161,7 @@ | |||
| 160 | #define ANOMALY_05000353 (1) | 161 | #define ANOMALY_05000353 (1) |
| 161 | #define ANOMALY_05000362 (1) | 162 | #define ANOMALY_05000362 (1) |
| 162 | #define ANOMALY_05000363 (0) | 163 | #define ANOMALY_05000363 (0) |
| 164 | #define ANOMALY_05000364 (0) | ||
| 163 | #define ANOMALY_05000380 (0) | 165 | #define ANOMALY_05000380 (0) |
| 164 | #define ANOMALY_05000386 (1) | 166 | #define ANOMALY_05000386 (1) |
| 165 | #define ANOMALY_05000389 (0) | 167 | #define ANOMALY_05000389 (0) |