diff options
Diffstat (limited to 'include/asm-v850')
-rw-r--r-- | include/asm-v850/anna.h | 6 | ||||
-rw-r--r-- | include/asm-v850/as85ep1.h | 6 | ||||
-rw-r--r-- | include/asm-v850/fpga85e2c.h | 6 | ||||
-rw-r--r-- | include/asm-v850/param.h | 3 | ||||
-rw-r--r-- | include/asm-v850/posix_types.h | 8 | ||||
-rw-r--r-- | include/asm-v850/rte_cb.h | 6 | ||||
-rw-r--r-- | include/asm-v850/sim.h | 5 | ||||
-rw-r--r-- | include/asm-v850/sim85e2.h | 6 |
8 files changed, 3 insertions, 43 deletions
diff --git a/include/asm-v850/anna.h b/include/asm-v850/anna.h index 3be77d5ecfc..cd5eaee103b 100644 --- a/include/asm-v850/anna.h +++ b/include/asm-v850/anna.h @@ -134,10 +134,4 @@ extern void anna_uart_pre_configure (unsigned chan, #define V850E_TIMER_D_TMCD_CS_MIN 1 /* min 2^1 divider */ -/* For <asm/param.h> */ -#ifndef HZ -#define HZ 100 -#endif - - #endif /* __V850_ANNA_H__ */ diff --git a/include/asm-v850/as85ep1.h b/include/asm-v850/as85ep1.h index 659bc910ffd..5a5ca9073d0 100644 --- a/include/asm-v850/as85ep1.h +++ b/include/asm-v850/as85ep1.h @@ -149,10 +149,4 @@ extern void as85ep1_uart_pre_configure (unsigned chan, #define V850E_TIMER_D_TMCD_CS_MIN 2 /* min 2^2 divider */ -/* For <asm/param.h> */ -#ifndef HZ -#define HZ 100 -#endif - - #endif /* __V850_AS85EP1_H__ */ diff --git a/include/asm-v850/fpga85e2c.h b/include/asm-v850/fpga85e2c.h index d32f04504b1..23aae666c71 100644 --- a/include/asm-v850/fpga85e2c.h +++ b/include/asm-v850/fpga85e2c.h @@ -79,10 +79,4 @@ extern char _r0_ram; #endif -/* For <asm/param.h> */ -#ifndef HZ -#define HZ 122 /* actually, 8.192ms ticks =~ 122.07 */ -#endif - - #endif /* __V850_FPGA85E2C_H__ */ diff --git a/include/asm-v850/param.h b/include/asm-v850/param.h index 3c65bd57378..28183269029 100644 --- a/include/asm-v850/param.h +++ b/include/asm-v850/param.h @@ -23,8 +23,7 @@ #define MAXHOSTNAMELEN 64 /* max length of hostname */ #ifdef __KERNEL__ -#include <asm/machdep.h> /* For HZ */ - +# define HZ CONFIG_HZ # define USER_HZ 100 # define CLOCKS_PER_SEC USER_HZ #endif diff --git a/include/asm-v850/posix_types.h b/include/asm-v850/posix_types.h index ccb7297a0ed..7f403b76539 100644 --- a/include/asm-v850/posix_types.h +++ b/include/asm-v850/posix_types.h @@ -44,15 +44,11 @@ typedef __kernel_uid_t __kernel_old_uid_t; typedef unsigned int __kernel_old_dev_t; typedef struct { -#if defined(__KERNEL__) || defined(__USE_ALL) int val[2]; -#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */ - int __val[2]; -#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */ } __kernel_fsid_t; -#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) +#if defined(__KERNEL__) /* We used to include <asm/bitops.h> here, which seems the right thing, but it caused nasty include-file definition order problems. Removing the @@ -71,6 +67,6 @@ typedef struct { #define __FD_ZERO(fd_set) \ memset (fd_set, 0, sizeof (*(fd_set *)fd_set)) -#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */ +#endif /* defined(__KERNEL__) */ #endif /* __V850_POSIX_TYPES_H__ */ diff --git a/include/asm-v850/rte_cb.h b/include/asm-v850/rte_cb.h index e85d261b79b..db9879f00aa 100644 --- a/include/asm-v850/rte_cb.h +++ b/include/asm-v850/rte_cb.h @@ -69,12 +69,6 @@ #endif /* CONFIG_RTE_MB_A_PCI */ -/* For <asm/param.h> */ -#ifndef HZ -#define HZ 100 -#endif - - #ifndef __ASSEMBLY__ extern void rte_cb_early_init (void); extern void rte_cb_init_irqs (void); diff --git a/include/asm-v850/sim.h b/include/asm-v850/sim.h index 10236abbe9b..026932d476c 100644 --- a/include/asm-v850/sim.h +++ b/include/asm-v850/sim.h @@ -40,11 +40,6 @@ #define R0_RAM_ADDR 0xFFFFF000 -/* For <asm/param.h> */ -#ifndef HZ -#define HZ 24 /* Minimum supported frequency. */ -#endif - /* For <asm/irq.h> */ #define NUM_CPU_IRQS 6 diff --git a/include/asm-v850/sim85e2.h b/include/asm-v850/sim85e2.h index 17dd4fa318e..8b4d6974066 100644 --- a/include/asm-v850/sim85e2.h +++ b/include/asm-v850/sim85e2.h @@ -66,10 +66,4 @@ #define R0_RAM_ADDR 0xFFFFE000 -/* For <asm/param.h> */ -#ifndef HZ -#define HZ 24 /* Minimum supported frequency. */ -#endif - - #endif /* __V850_SIM85E2_H__ */ |