diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:11:56 -0400 |
| commit | 71d530cd1b6d97094481002a04c77fea1c8e1c22 (patch) | |
| tree | e786da7145d83c19a594adf76ed90d52c51058b1 /include/asm-mips/mach-jazz/param.h | |
| parent | d7a80dad2fe19a2b8c119c8e9cba605474a75a2b (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
Merge branch 'master' into upstream
Conflicts:
drivers/scsi/libata-core.c
drivers/scsi/libata-scsi.c
include/linux/pci_ids.h
Diffstat (limited to 'include/asm-mips/mach-jazz/param.h')
| -rw-r--r-- | include/asm-mips/mach-jazz/param.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/asm-mips/mach-jazz/param.h b/include/asm-mips/mach-jazz/param.h deleted file mode 100644 index 639763a517bc..000000000000 --- a/include/asm-mips/mach-jazz/param.h +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * This file is subject to the terms and conditions of the GNU General Public | ||
| 3 | * License. See the file "COPYING" in the main directory of this archive | ||
| 4 | * for more details. | ||
| 5 | * | ||
| 6 | * Copyright (C) 2003 by Ralf Baechle | ||
| 7 | */ | ||
| 8 | #ifndef __ASM_MACH_JAZZ_PARAM_H | ||
| 9 | #define __ASM_MACH_JAZZ_PARAM_H | ||
| 10 | |||
| 11 | /* | ||
| 12 | * Jazz is currently using the internal 100Hz timer of the R4030 | ||
| 13 | */ | ||
| 14 | #define HZ 100 /* Internal kernel timer frequency */ | ||
| 15 | |||
| 16 | #endif /* __ASM_MACH_JAZZ_PARAM_H */ | ||