lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm

Browse Source 
* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB
  [ARM] 5166/1: magician: add MAINTAINERS entry
  [ARM] fix pnx4008 build errors
  [ARM] Fix SMP booting with non-zero PHYS_OFFSET
  [ARM] 5185/1: Fix spi num_chipselect for lubbock
  [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
  [ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include
  [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
  [ARM] Eliminate useless includes of asm/mach-types.h
  [ARM] Fix circular include dependency with IRQ headers
  avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
  avr32: Introduce arch/avr32/mach-*/include/mach
  avr32: Move include/asm-avr32 to arch/avr32/include/asm
  [ARM] sa1100_wdt: use reset_status to remember watchdog reset status
  [ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
  [ARM] pxa: introduce reset.h for reset specific header information
This commit is contained in:
Linus Torvalds
2008-08-08 11:38:42 -07:00
parent f1c7f79b6a 097d9eb537
commit 49b75b87ce
1722 changed files with 3739 additions and 3194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/keyboard/aaed2000_kbd.c
View File

@@ -20,8 +20,8 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <asm/arch/hardware.h>
#include <asm/arch/aaed2000.h>
#include <mach/hardware.h>
#include <mach/aaed2000.h>
#define KB_ROWS 12
#define KB_COLS 8

8
drivers/input/keyboard/corgikbd.c
View File

@@ -20,10 +20,10 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <asm/arch/corgi.h>
#include <asm/arch/hardware.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxa2xx-gpio.h>
#include <mach/corgi.h>
#include <mach/hardware.h>
#include <mach/pxa-regs.h>
#include <mach/pxa2xx-gpio.h>
#include <asm/hardware/scoop.h>
#define KB_ROWS 8

4
drivers/input/keyboard/jornada720_kbd.c
View File

@@ -24,8 +24,8 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <asm/arch/jornada720.h>
#include <asm/hardware.h>
#include <mach/jornada720.h>
#include <mach/hardware.h>
MODULE_AUTHOR("Kristoffer Ericson <Kristoffer.Ericson@gmail.com>");
MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver");

11
drivers/input/keyboard/omap-keypad.c
View File

@@ -34,14 +34,13 @@
#include <linux/platform_device.h>
#include <linux/mutex.h>
#include <linux/errno.h>
#include <asm/arch/gpio.h>
#include <asm/arch/keypad.h>
#include <asm/arch/menelaus.h>
#include <mach/gpio.h>
#include <mach/keypad.h>
#include <mach/menelaus.h>
#include <asm/irq.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/io.h>
#include <asm/mach-types.h>
#include <asm/arch/mux.h>
#include <mach/mux.h>
#undef NEW_BOARD_LEARNING_MODE

5
drivers/input/keyboard/pxa27x_keypad.c
View File

@@ -26,12 +26,11 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/arch/hardware.h>
#include <asm/arch/pxa27x_keypad.h>
#include <mach/hardware.h>
#include <mach/pxa27x_keypad.h>
/*
* Keypad Controller registers

8
drivers/input/keyboard/spitzkbd.c
View File

@@ -20,10 +20,10 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <asm/arch/spitz.h>
#include <asm/arch/hardware.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxa2xx-gpio.h>
#include <mach/spitz.h>
#include <mach/hardware.h>
#include <mach/pxa-regs.h>
#include <mach/pxa2xx-gpio.h>
#define KB_ROWS 7
#define KB_COLS 11

4
drivers/input/keyboard/tosakbd.c
View File

@@ -19,8 +19,8 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <asm/arch/gpio.h>
#include <asm/arch/tosa.h>
#include <mach/gpio.h>
#include <mach/tosa.h>
#define KB_ROWMASK(r) (1 << (r))
#define SCANCODE(r, c) (((r)<<4) + (c) + 1)

2
drivers/input/misc/ixp4xx-beeper.c
View File

@@ -20,7 +20,7 @@
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/interrupt.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
MODULE_DESCRIPTION("ixp4xx beeper driver");

2
drivers/input/mouse/rpcmouse.c
View File

@@ -23,7 +23,7 @@
#include <linux/init.h>
#include <linux/input.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/irq.h>
#include <asm/io.h>
#include <asm/hardware/iomd.h>

2
drivers/input/serio/rpckbd.c
View File

@@ -35,7 +35,7 @@
#include <linux/platform_device.h>
#include <asm/irq.h>
#include <asm/hardware.h>
#include <mach/hardware.h>
#include <asm/io.h>
#include <asm/hardware/iomd.h>
#include <asm/system.h>

8
drivers/input/touchscreen/corgi_ts.c
View File

@@ -19,10 +19,10 @@
#include <linux/slab.h>
#include <linux/irq.h>
#include <asm/arch/sharpsl.h>
#include <asm/arch/hardware.h>
#include <asm/arch/pxa-regs.h>
#include <asm/arch/pxa2xx-gpio.h>
#include <mach/sharpsl.h>
#include <mach/hardware.h>
#include <mach/pxa-regs.h>
#include <mach/pxa2xx-gpio.h>
#define PWR_MODE_ACTIVE 0

4
drivers/input/touchscreen/h3600_ts_input.c
View File

@@ -39,8 +39,8 @@
#include <linux/delay.h>
/* SA1100 serial defines */
#include <asm/arch/hardware.h>
#include <asm/arch/irqs.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
#define DRIVER_DESC "H3600 touchscreen driver"

4
drivers/input/touchscreen/jornada720_ts.c
View File

@@ -19,8 +19,8 @@
#include <linux/interrupt.h>
#include <linux/module.h>
#include <asm/hardware.h>
#include <asm/arch/jornada720.h>
#include <mach/hardware.h>
#include <mach/jornada720.h>
MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
MODULE_DESCRIPTION("HP Jornada 710/720/728 touchscreen driver");

2
drivers/input/touchscreen/mainstone-wm97xx.c
View File

@@ -33,7 +33,7 @@
#include <linux/interrupt.h>
#include <linux/wm97xx.h>
#include <linux/io.h>
#include <asm/arch/pxa-regs.h>
#include <mach/pxa-regs.h>
#define VERSION "0.13"