diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-01-17 18:34:51 -0500 |
| commit | 9cdf083f981b8d37b3212400a359368661385099 (patch) | |
| tree | aa15a6a08ad87e650dea40fb59b3180bef0d345b /include/asm-arm/arch-s3c2410/h1940-latch.h | |
| parent | e499e01d234a31d59679b7b1e1cf628d917ba49a (diff) | |
| parent | a8b3485287731978899ced11f24628c927890e78 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/arch-s3c2410/h1940-latch.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/h1940-latch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-s3c2410/h1940-latch.h b/include/asm-arm/arch-s3c2410/h1940-latch.h index c5802411f43d..c3de5ab102eb 100644 --- a/include/asm-arm/arch-s3c2410/h1940-latch.h +++ b/include/asm-arm/arch-s3c2410/h1940-latch.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* linux/include/asm-arm/arch-s3c2410/h1940-latch.h | 1 | /* linux/include/asm-arm/arch-s3c2410/h1940-latch.h |
| 2 | * | 2 | * |
| 3 | * (c) 2005 Simtec Electronics | 3 | * Copyright (c) 2005 Simtec Electronics |
| 4 | * http://armlinux.simtec.co.uk/ | 4 | * http://armlinux.simtec.co.uk/ |
| 5 | * Ben Dooks <ben@simtec.co.uk> | 5 | * Ben Dooks <ben@simtec.co.uk> |
| 6 | * | 6 | * |
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | 17 | ||
| 18 | #ifndef __ASSEMBLY__ | 18 | #ifndef __ASSEMBLY__ |
| 19 | #define H1940_LATCH ((void __iomem *)0xF8000000) | 19 | #define H1940_LATCH ((void __force __iomem *)0xF8000000) |
| 20 | #else | 20 | #else |
| 21 | #define H1940_LATCH 0xF8000000 | 21 | #define H1940_LATCH 0xF8000000 |
| 22 | #endif | 22 | #endif |