diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 11:32:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 11:32:17 +0200 |
| commit | 206855c321adee56db3946ca09a5887cddb9d598 (patch) | |
| tree | 13a2729d4d0e37170552bd9ad3c6bba71ba0c55c /arch/arm/include/asm/io.h | |
| parent | e8d3f455de4f42d4bab2f6f1aeb2cf3bd18eb508 (diff) | |
| parent | cb58ffc3889f0545628f138f849e759a331b8ddc (diff) | |
Merge branch 'x86/urgent' into core/signal
Conflicts:
arch/x86/kernel/signal_64.c
Diffstat (limited to 'arch/arm/include/asm/io.h')
| -rw-r--r-- | arch/arm/include/asm/io.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 71934856fc2..a8094451be5 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -60,10 +60,9 @@ extern void __raw_readsl(const void __iomem *addr, void *data, int longlen); #define MT_DEVICE 0 #define MT_DEVICE_NONSHARED 1 #define MT_DEVICE_CACHED 2 -#define MT_DEVICE_IXP2000 3 -#define MT_DEVICE_WC 4 +#define MT_DEVICE_WC 3 /* - * types 5 onwards can be found in asm/mach/map.h and are undefined + * types 4 onwards can be found in asm/mach/map.h and are undefined * for ioremap */ |