diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-02-10 01:26:32 -0500 |
| commit | b22364c8eec89e6b0c081a237f3b6348df87796f (patch) | |
| tree | 233a923281fb640106465d076997ff511efb6edf /include/asm-arm/arch-iop13xx/iq81340.h | |
| parent | 2c8dc071517ec2843869024dc82be2e246f41064 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/arch-iop13xx/iq81340.h')
| -rw-r--r-- | include/asm-arm/arch-iop13xx/iq81340.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/asm-arm/arch-iop13xx/iq81340.h b/include/asm-arm/arch-iop13xx/iq81340.h index b98f8f109c22..ba2cf931e9ce 100644 --- a/include/asm-arm/arch-iop13xx/iq81340.h +++ b/include/asm-arm/arch-iop13xx/iq81340.h | |||
| @@ -24,8 +24,5 @@ | |||
| 24 | #define PBI_CF_IDE_BASE (IQ81340_CMP_FLSH) | 24 | #define PBI_CF_IDE_BASE (IQ81340_CMP_FLSH) |
| 25 | #define PBI_CF_BAR_ADDR (IOP13XX_PBI_BAR1) | 25 | #define PBI_CF_BAR_ADDR (IOP13XX_PBI_BAR1) |
| 26 | 26 | ||
| 27 | /* These are the values used in the Machine description */ | 27 | |
| 28 | #define PHYS_IO 0xfeffff00 | ||
| 29 | #define IO_PG_OFFSET 0xffffff00 | ||
| 30 | #define BOOT_PARAM_OFFSET 0x00000100 | ||
| 31 | #endif /* _IQ81340_H_ */ | 28 | #endif /* _IQ81340_H_ */ |