diff options
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v10/drivers/axisflashmap.c | 1 | ||||
-rw-r--r-- | arch/cris/arch-v32/drivers/axisflashmap.c | 1 | ||||
-rw-r--r-- | arch/cris/kernel/time.c | 5 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c index 11ab3836aac6..56b038c8d482 100644 --- a/arch/cris/arch-v10/drivers/axisflashmap.c +++ b/arch/cris/arch-v10/drivers/axisflashmap.c | |||
@@ -140,6 +140,7 @@ | |||
140 | #include <linux/kernel.h> | 140 | #include <linux/kernel.h> |
141 | #include <linux/config.h> | 141 | #include <linux/config.h> |
142 | #include <linux/init.h> | 142 | #include <linux/init.h> |
143 | #include <linux/slab.h> | ||
143 | 144 | ||
144 | #include <linux/mtd/concat.h> | 145 | #include <linux/mtd/concat.h> |
145 | #include <linux/mtd/map.h> | 146 | #include <linux/mtd/map.h> |
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c index 78ed52b1cdac..b679f983b90a 100644 --- a/arch/cris/arch-v32/drivers/axisflashmap.c +++ b/arch/cris/arch-v32/drivers/axisflashmap.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
21 | #include <linux/config.h> | 21 | #include <linux/config.h> |
22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
23 | #include <linux/slab.h> | ||
23 | 24 | ||
24 | #include <linux/mtd/concat.h> | 25 | #include <linux/mtd/concat.h> |
25 | #include <linux/mtd/map.h> | 26 | #include <linux/mtd/map.h> |
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c index a2d99b4aedcd..66ba8898db07 100644 --- a/arch/cris/kernel/time.c +++ b/arch/cris/kernel/time.c | |||
@@ -31,10 +31,7 @@ | |||
31 | #include <linux/timex.h> | 31 | #include <linux/timex.h> |
32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
33 | #include <linux/profile.h> | 33 | #include <linux/profile.h> |
34 | 34 | #include <linux/sched.h> /* just for sched_clock() - funny that */ | |
35 | u64 jiffies_64 = INITIAL_JIFFIES; | ||
36 | |||
37 | EXPORT_SYMBOL(jiffies_64); | ||
38 | 35 | ||
39 | int have_rtc; /* used to remember if we have an RTC or not */; | 36 | int have_rtc; /* used to remember if we have an RTC or not */; |
40 | 37 | ||