diff options
| -rw-r--r-- | drivers/clocksource/tcb_clksrc.c | 2 | ||||
| -rw-r--r-- | drivers/misc/atmel_tclib.c | 2 | ||||
| -rw-r--r-- | drivers/pwm/pwm-atmel-tcb.c | 2 | ||||
| -rw-r--r-- | include/soc/at91/atmel_tcb.h (renamed from include/linux/atmel_tc.h) | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c index 43f4d5c4d6fa..138a12090149 100644 --- a/drivers/clocksource/tcb_clksrc.c +++ b/drivers/clocksource/tcb_clksrc.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <linux/io.h> | 11 | #include <linux/io.h> |
| 12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
| 13 | #include <linux/syscore_ops.h> | 13 | #include <linux/syscore_ops.h> |
| 14 | #include <linux/atmel_tc.h> | 14 | #include <soc/at91/atmel_tcb.h> |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | /* | 17 | /* |
diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c index ac24a4bd63f7..194f774ab3a1 100644 --- a/drivers/misc/atmel_tclib.c +++ b/drivers/misc/atmel_tclib.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/atmel_tc.h> | ||
| 2 | #include <linux/clk.h> | 1 | #include <linux/clk.h> |
| 3 | #include <linux/err.h> | 2 | #include <linux/err.h> |
| 4 | #include <linux/init.h> | 3 | #include <linux/init.h> |
| @@ -10,6 +9,7 @@ | |||
| 10 | #include <linux/slab.h> | 9 | #include <linux/slab.h> |
| 11 | #include <linux/export.h> | 10 | #include <linux/export.h> |
| 12 | #include <linux/of.h> | 11 | #include <linux/of.h> |
| 12 | #include <soc/at91/atmel_tcb.h> | ||
| 13 | 13 | ||
| 14 | /* | 14 | /* |
| 15 | * This is a thin library to solve the problem of how to portably allocate | 15 | * This is a thin library to solve the problem of how to portably allocate |
diff --git a/drivers/pwm/pwm-atmel-tcb.c b/drivers/pwm/pwm-atmel-tcb.c index 0d0f8376bc35..7da1fdb4d269 100644 --- a/drivers/pwm/pwm-atmel-tcb.c +++ b/drivers/pwm/pwm-atmel-tcb.c | |||
| @@ -17,10 +17,10 @@ | |||
| 17 | #include <linux/ioport.h> | 17 | #include <linux/ioport.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/atmel_tc.h> | ||
| 21 | #include <linux/pwm.h> | 20 | #include <linux/pwm.h> |
| 22 | #include <linux/of_device.h> | 21 | #include <linux/of_device.h> |
| 23 | #include <linux/slab.h> | 22 | #include <linux/slab.h> |
| 23 | #include <soc/at91/atmel_tcb.h> | ||
| 24 | 24 | ||
| 25 | #define NPWM 6 | 25 | #define NPWM 6 |
| 26 | 26 | ||
diff --git a/include/linux/atmel_tc.h b/include/soc/at91/atmel_tcb.h index 468fdfa643f0..c3c7200ce151 100644 --- a/include/linux/atmel_tc.h +++ b/include/soc/at91/atmel_tcb.h | |||
| @@ -7,8 +7,8 @@ | |||
| 7 | * (at your option) any later version. | 7 | * (at your option) any later version. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #ifndef ATMEL_TC_H | 10 | #ifndef __SOC_ATMEL_TCB_H |
| 11 | #define ATMEL_TC_H | 11 | #define __SOC_ATMEL_TCB_H |
| 12 | 12 | ||
| 13 | #include <linux/compiler.h> | 13 | #include <linux/compiler.h> |
| 14 | #include <linux/list.h> | 14 | #include <linux/list.h> |
