diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
| commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
| tree | 50c101806f4d3b6585222dda060559eb4f3e005a /arch/m32r/kernel/time.c | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'arch/m32r/kernel/time.c')
| -rw-r--r-- | arch/m32r/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c index 2ebce2063fea..b8e68b542302 100644 --- a/arch/m32r/kernel/time.c +++ b/arch/m32r/kernel/time.c | |||
| @@ -57,7 +57,7 @@ static unsigned long do_gettimeoffset(void) | |||
| 57 | 57 | ||
| 58 | #if defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_XNUX2) \ | 58 | #if defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_XNUX2) \ |
| 59 | || defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_M32700) \ | 59 | || defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_M32700) \ |
| 60 | || defined(CONFIG_CHIP_OPSP) | 60 | || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104) |
| 61 | #ifndef CONFIG_SMP | 61 | #ifndef CONFIG_SMP |
| 62 | 62 | ||
| 63 | unsigned long count; | 63 | unsigned long count; |
| @@ -268,7 +268,7 @@ void __init time_init(void) | |||
| 268 | 268 | ||
| 269 | #if defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_XNUX2) \ | 269 | #if defined(CONFIG_CHIP_M32102) || defined(CONFIG_CHIP_XNUX2) \ |
| 270 | || defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_M32700) \ | 270 | || defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_M32700) \ |
| 271 | || defined(CONFIG_CHIP_OPSP) | 271 | || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104) |
| 272 | 272 | ||
| 273 | /* M32102 MFT setup */ | 273 | /* M32102 MFT setup */ |
| 274 | setup_irq(M32R_IRQ_MFT2, &irq0); | 274 | setup_irq(M32R_IRQ_MFT2, &irq0); |