diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:42 -0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:05:42 -0400 |
| commit | 05a690d2db5bd57d3c94293b06b69158535835df (patch) | |
| tree | fb924faf327ae3d6b1f4a7cde96e007e9b32d7be /arch/arm/mach-s3c64xx/include | |
| parent | 1770a8988f6178efdc1bfc85fb29deacac49fe91 (diff) | |
| parent | 4f7cdc38c000deba82479205f4c99f4c1e7c6d1f (diff) | |
ARM: Merge for-2635/samsung-ts
Merge branch 'for-2635/samsung-ts' into for-linus/samsung2
Diffstat (limited to 'arch/arm/mach-s3c64xx/include')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/map.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h index 801c1c0f3a95..869c8e025127 100644 --- a/arch/arm/mach-s3c64xx/include/mach/map.h +++ b/arch/arm/mach-s3c64xx/include/mach/map.h | |||
| @@ -103,5 +103,6 @@ | |||
| 103 | #define S3C_PA_USBHOST S3C64XX_PA_USBHOST | 103 | #define S3C_PA_USBHOST S3C64XX_PA_USBHOST |
| 104 | #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG | 104 | #define S3C_PA_USB_HSOTG S3C64XX_PA_USB_HSOTG |
| 105 | #define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY | 105 | #define S3C_VA_USB_HSPHY S3C64XX_VA_USB_HSPHY |
| 106 | #define SAMSUNG_PA_ADC S3C64XX_PA_ADC | ||
| 106 | 107 | ||
| 107 | #endif /* __ASM_ARCH_6400_MAP_H */ | 108 | #endif /* __ASM_ARCH_6400_MAP_H */ |