diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:20:08 +0900 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-10-04 20:20:08 +0900 |
commit | 86f82da586098f16d92b5637808c323f5455e935 (patch) | |
tree | 6397eb5550172b89d383254c7e4bca87ae4a8659 /arch/arm/plat-s5p/include/plat/reset.h | |
parent | Merge branch 'next-samsung-devel' into next-samsung-devel-2 (diff) | |
parent | ARM: SAMSUNG: Move S5P header files to plat-samsung (diff) | |
download | linux-dev-86f82da586098f16d92b5637808c323f5455e935.tar.xz linux-dev-86f82da586098f16d92b5637808c323f5455e935.zip |
Merge branch 'next-samsung-cleanup-2' into next-samsung-devel-2
Conflicts:
arch/arm/plat-s5p/include/plat/pll.h
Diffstat (limited to 'arch/arm/plat-s5p/include/plat/reset.h')
-rw-r--r-- | arch/arm/plat-s5p/include/plat/reset.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/plat-s5p/include/plat/reset.h b/arch/arm/plat-s5p/include/plat/reset.h deleted file mode 100644 index 335e97812eed..000000000000 --- a/arch/arm/plat-s5p/include/plat/reset.h +++ /dev/null @@ -1,16 +0,0 @@ -/* linux/arch/arm/plat-s5p/include/plat/reset.h - * - * Copyright (c) 2010 Samsung Electronics Co., Ltd. - * http://www.samsung.com/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. -*/ - -#ifndef __ASM_PLAT_S5P_RESET_H -#define __ASM_PLAT_S5P_RESET_H __FILE__ - -extern void (*s5p_reset_hook)(void); - -#endif /* __ASM_PLAT_S5P_RESET_H */ |