tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

sh: Move KEYSC header file

This patch moves the KEYSC header file from the
SuperH specific asm directory to a place where
it can be shared by multiple architectures.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

authored by

Magnus Damm and committed by
Paul Mundt fc1d003d 9a160707

+9 -9
+1 -1
arch/sh/boards/mach-ecovec24/setup.c
··· 20 20 #include <linux/i2c.h> 21 21 #include <linux/i2c/tsc2007.h> 22 22 #include <linux/input.h> 23 + #include <linux/input/sh_keysc.h> 23 24 #include <linux/mfd/sh_mobile_sdhi.h> 24 25 #include <video/sh_mobile_lcdc.h> 25 26 #include <media/sh_mobile_ceu.h> 26 27 #include <asm/heartbeat.h> 27 28 #include <asm/sh_eth.h> 28 - #include <asm/sh_keysc.h> 29 29 #include <asm/clock.h> 30 30 #include <asm/suspend.h> 31 31 #include <cpu/sh7724.h>
+1 -1
arch/sh/boards/mach-kfr2r09/setup.c
··· 16 16 #include <linux/clk.h> 17 17 #include <linux/gpio.h> 18 18 #include <linux/input.h> 19 + #include <linux/input/sh_keysc.h> 19 20 #include <linux/i2c.h> 20 21 #include <linux/usb/r8a66597.h> 21 22 #include <media/soc_camera.h> ··· 26 25 #include <asm/clock.h> 27 26 #include <asm/machvec.h> 28 27 #include <asm/io.h> 29 - #include <asm/sh_keysc.h> 30 28 #include <cpu/sh7724.h> 31 29 #include <mach/kfr2r09.h> 32 30
+1 -1
arch/sh/boards/mach-migor/setup.c
··· 11 11 #include <linux/platform_device.h> 12 12 #include <linux/interrupt.h> 13 13 #include <linux/input.h> 14 + #include <linux/input/sh_keysc.h> 14 15 #include <linux/mtd/physmap.h> 15 16 #include <linux/mtd/nand.h> 16 17 #include <linux/i2c.h> ··· 26 25 #include <asm/clock.h> 27 26 #include <asm/machvec.h> 28 27 #include <asm/io.h> 29 - #include <asm/sh_keysc.h> 30 28 #include <asm/suspend.h> 31 29 #include <mach/migor.h> 32 30 #include <cpu/sh7722.h>
+1 -1
arch/sh/boards/mach-se/7722/setup.c
··· 14 14 #include <linux/platform_device.h> 15 15 #include <linux/ata_platform.h> 16 16 #include <linux/input.h> 17 + #include <linux/input/sh_keysc.h> 17 18 #include <linux/smc91x.h> 18 19 #include <mach-se/mach/se7722.h> 19 20 #include <mach-se/mach/mrshpc.h> ··· 22 21 #include <asm/clock.h> 23 22 #include <asm/io.h> 24 23 #include <asm/heartbeat.h> 25 - #include <asm/sh_keysc.h> 26 24 #include <cpu/sh7722.h> 27 25 28 26 /* Heartbeat */
+1 -1
arch/sh/boards/mach-se/7724/setup.c
··· 19 19 #include <linux/smc91x.h> 20 20 #include <linux/gpio.h> 21 21 #include <linux/input.h> 22 + #include <linux/input/sh_keysc.h> 22 23 #include <linux/usb/r8a66597.h> 23 24 #include <video/sh_mobile_lcdc.h> 24 25 #include <media/sh_mobile_ceu.h> ··· 28 27 #include <asm/heartbeat.h> 29 28 #include <asm/sh_eth.h> 30 29 #include <asm/clock.h> 31 - #include <asm/sh_keysc.h> 32 30 #include <asm/suspend.h> 33 31 #include <cpu/sh7724.h> 34 32 #include <mach-se/mach/se7724.h>
+3 -3
arch/sh/include/asm/sh_keysc.h include/linux/input/sh_keysc.h
··· 1 - #ifndef __ASM_KEYSC_H__ 2 - #define __ASM_KEYSC_H__ 1 + #ifndef __SH_KEYSC_H__ 2 + #define __SH_KEYSC_H__ 3 3 4 4 #define SH_KEYSC_MAXKEYS 30 5 5 ··· 11 11 int keycodes[SH_KEYSC_MAXKEYS]; 12 12 }; 13 13 14 - #endif /* __ASM_KEYSC_H__ */ 14 + #endif /* __SH_KEYSC_H__ */
+1 -1
drivers/input/keyboard/sh_keysc.c
··· 18 18 #include <linux/delay.h> 19 19 #include <linux/platform_device.h> 20 20 #include <linux/input.h> 21 + #include <linux/input/sh_keysc.h> 21 22 #include <linux/clk.h> 22 23 #include <linux/io.h> 23 - #include <asm/sh_keysc.h> 24 24 25 25 #define KYCR1_OFFS 0x00 26 26 #define KYCR2_OFFS 0x04