Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 212580
b: refs/heads/master
c: 4a2490e
h: refs/heads/master
v: v3
  • Loading branch information
Mark F. Brown authored and Eric Miao committed Oct 9, 2010
1 parent f082de7 commit 185ec2e
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a754aea25e804d0635d1871558bee5024605ff92
refs/heads/master: 4a2490eac897e3648c4800b1068b56b7e1ad91b3
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/ohci.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <mach/pxa2xx_spi.h>
#include <mach/camera.h>
#include <mach/audio.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/em-x270.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <mach/pxafb.h>
#include <mach/ohci.h>
#include <mach/mmc.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <plat/i2c.h>
#include <mach/camera.h>
#include <mach/pxa2xx_spi.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/ezx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <mach/ohci.h>
#include <plat/i2c.h>
#include <mach/hardware.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <mach/camera.h>

#include "devices.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/littleton.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/pxa2xx_spi.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <mach/littleton.h>
#include <plat/i2c.h>
#include <plat/pxa3xx_nand.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/mainstone.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/ohci.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>

#include "generic.h"
#include "devices.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/mioa701.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

#include <mach/pxa27x.h>
#include <mach/regs-rtc.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/udc.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/palmld.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include <mach/mmc.h>
#include <mach/pxafb.h>
#include <mach/irda.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <mach/palmasoc.h>
#include <mach/palm27x.h>

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/palmt5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include <mach/mmc.h>
#include <mach/pxafb.h>
#include <mach/irda.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <mach/udc.h>
#include <mach/palmasoc.h>
#include <mach/palm27x.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/palmtreo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include <mach/mmc.h>
#include <mach/pxafb.h>
#include <mach/irda.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <mach/udc.h>
#include <mach/ohci.h>
#include <mach/pxa2xx-regs.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/palmtx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#include <mach/mmc.h>
#include <mach/pxafb.h>
#include <mach/irda.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <mach/udc.h>
#include <mach/palmasoc.h>
#include <mach/palm27x.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/palmz72.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include <mach/mmc.h>
#include <mach/pxafb.h>
#include <mach/irda.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <mach/udc.h>
#include <mach/palmasoc.h>
#include <mach/palm27x.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/tavorevb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

#include <mach/pxa930.h>
#include <mach/pxafb.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>

#include "devices.h"
#include "generic.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/z2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <mach/z2.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <mach/pxa2xx_spi.h>

#include <plat/i2c.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/zylonite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <mach/zylonite.h>
#include <mach/mmc.h>
#include <mach/ohci.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
#include <plat/pxa3xx_nand.h>

#include "devices.h"
Expand Down
0 ...arm/mach-pxa/include/mach/pxa27x_keypad.h → ...arm/plat-pxa/include/plat/pxa27x_keypad.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion trunk/drivers/input/keyboard/pxa27x_keypad.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <asm/mach/map.h>

#include <mach/hardware.h>
#include <mach/pxa27x_keypad.h>
#include <plat/pxa27x_keypad.h>
/*
* Keypad Controller registers
*/
Expand Down

0 comments on commit 185ec2e

Please sign in to comment.