diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-14 10:56:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-14 10:56:40 -0400 |
| commit | 6a7ebdf2fd15417e87b4fd02ff411aeaca34da5f (patch) | |
| tree | 86b15d8cd3e25c97b348b5a61bdb16c02726a480 /arch/arm/mach-exynos4/headsmp.S | |
| parent | f6b72b6217f8c24f2a54988e58af858b4e66024d (diff) | |
| parent | 51414d41084496aaefd06d7f19eb8206e8bfac2d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/bluetooth/l2cap_core.c
Diffstat (limited to 'arch/arm/mach-exynos4/headsmp.S')
| -rw-r--r-- | arch/arm/mach-exynos4/headsmp.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/headsmp.S b/arch/arm/mach-exynos4/headsmp.S index 6c6cfc50c46b..3cdeb3647542 100644 --- a/arch/arm/mach-exynos4/headsmp.S +++ b/arch/arm/mach-exynos4/headsmp.S | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | 15 | ||
| 16 | __INIT | 16 | __CPUINIT |
| 17 | 17 | ||
| 18 | /* | 18 | /* |
| 19 | * exynos4 specific entry point for secondary CPUs. This provides | 19 | * exynos4 specific entry point for secondary CPUs. This provides |