History

arm: Move sp810.h to include/linux/amba/

Since it is now used by code under drivers/clk/ it makes sense for this file to be in a more generic location. This is required for building vexpress support on arm64.

Catalin Marinas committed 13 years ago

Commit da660b41 parent 949db153 files · +2 −3Browse files

Unified · Split

3 files
  1. arch/arm/plat-spear/restart.c +1 −1
  2. drivers/clk/versatile/clk-vexpress.c +1 −2
  3. include/linux/amba/sp810.h +0 −0
arch/arm/plat-spear/restart.c+1−1
@@ -11,8 +11,8 @@ · 10 unmodified lines
11 * warranty of any kind, whether express or implied.11 * warranty of any kind, whether express or implied.
12 */12 */
13#include <linux/io.h>13#include <linux/io.h>
14#include <linux/amba/sp810.h>
14#include <asm/system_misc.h>15#include <asm/system_misc.h>
15#include <asm/hardware/sp810.h>
16#include <mach/spear.h>16#include <mach/spear.h>
17#include <mach/generic.h>17#include <mach/generic.h>
18 18
drivers/clk/versatile/clk-vexpress.c+1−2
@@ -11,6 +11,7 @@ · 10 unmodified lines
11 * Copyright (C) 2012 ARM Limited11 * Copyright (C) 2012 ARM Limited
12 */12 */
13 13
14#include <linux/amba/sp810.h>
14#include <linux/clkdev.h>15#include <linux/clkdev.h>
15#include <linux/clk-provider.h>16#include <linux/clk-provider.h>
16#include <linux/err.h>17#include <linux/err.h>
@@ -18,8 +19,6 @@ · 1 unmodified line
18#include <linux/of_address.h>19#include <linux/of_address.h>
19#include <linux/vexpress.h>20#include <linux/vexpress.h>
20 21
21#include <asm/hardware/sp810.h>
22
23static struct clk *vexpress_sp810_timerclken[4];22static struct clk *vexpress_sp810_timerclken[4];
24static DEFINE_SPINLOCK(vexpress_sp810_lock);23static DEFINE_SPINLOCK(vexpress_sp810_lock);
25 24
include/linux/amba/sp810.hrenamed from arch/arm/include/asm/hardware/sp810.h+0−0

File renamed without changes.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t