Merge tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
Samsung cleanup for v4.3 - make the following headers local watchdog-reset, onenand-core, irq-uart, backlight, ata-core, regs-usb-hsotg-phy, spi-core, nand-core, fb-core and regs-srom headers - make the following c file local s5p-dev-mfc, dev-backlight and setup-camif c file - remove keypad-core.h file - drop owner assignment in pmu.c - remove duplicated define of SLEEP_MAGIC - make exynos5420_powerdown_conf() staic * tag 'samsung-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: SAMSUNG: remove keypad-core header in plat-samsung ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx ARM: SAMSUNG: local onenand-core header in mach-s3c64xx ARM: SAMSUNG: local irq-uart header in mach-s3c64xx ARM: SAMSUNG: local backlight header in mach-s3c64xx ARM: SAMSUNG: local ata-core header in mach-s3c64xx ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx ARM: SAMSUNG: local spi-core header in mach-s3c24xx ARM: SAMSUNG: local nand-core header in mach-s3c24xx ARM: SAMSUNG: local fb-core header in mach-s3c24xx ARM: SAMSUNG: local regs-srom header in mach-exynos ARM: SAMSUNG: make local s5p-dev-mfc in mach-exynos ARM: SAMSUNG: make local dev-backlight in mach-s3c64xx ARM: SAMSUNG: make local setup-camif in mach-s3c24xx ARM: EXYNOS: Drop owner assignment in pmu.c ARM: EXYNOS: Remove duplicated define of SLEEP_MAGIC ARM: EXYNOS: Make local function static Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
@@ -48,12 +48,12 @@
|
||||
#include <plat/devs.h>
|
||||
#include <plat/pm.h>
|
||||
#include <plat/gpio-cfg.h>
|
||||
#include <plat/irq-uart.h>
|
||||
#include <plat/pwm-core.h>
|
||||
#include <plat/regs-irqtype.h>
|
||||
#include <plat/watchdog-reset.h>
|
||||
|
||||
#include "common.h"
|
||||
#include "irq-uart.h"
|
||||
#include "watchdog-reset.h"
|
||||
|
||||
/* External clock frequency */
|
||||
static unsigned long xtal_f = 12000000, xusbxti_f = 48000000;
|
||||
|
Reference in New Issue
Block a user