diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:41 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 10:22:41 -0500 |
| commit | baf9226667734579e344f612ed39f727079cad51 (patch) | |
| tree | 9744efb5f1838ea73b695a0ab862547fdcf92ecf /arch/arm/mach-s3c6400/include | |
| parent | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (diff) | |
| parent | 43f0de8d0298e624e6c3bf2185b6003a59b331bd (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-s3c6400/include')
| -rw-r--r-- | arch/arm/mach-s3c6400/include/mach/map.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index fc8b223bad4f..866be31872a5 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h | |||
| @@ -48,6 +48,8 @@ | |||
| 48 | #define S3C64XX_PA_IIS1 (0x7F003000) | 48 | #define S3C64XX_PA_IIS1 (0x7F003000) |
| 49 | #define S3C64XX_PA_TIMER (0x7F006000) | 49 | #define S3C64XX_PA_TIMER (0x7F006000) |
| 50 | #define S3C64XX_PA_IIC0 (0x7F004000) | 50 | #define S3C64XX_PA_IIC0 (0x7F004000) |
| 51 | #define S3C64XX_PA_PCM0 (0x7F009000) | ||
| 52 | #define S3C64XX_PA_PCM1 (0x7F00A000) | ||
| 51 | #define S3C64XX_PA_IISV4 (0x7F00D000) | 53 | #define S3C64XX_PA_IISV4 (0x7F00D000) |
| 52 | #define S3C64XX_PA_IIC1 (0x7F00F000) | 54 | #define S3C64XX_PA_IIC1 (0x7F00F000) |
| 53 | 55 | ||