Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 149325
b: refs/heads/master
c: f0a8370
h: refs/heads/master
i:
  149323: 672d5f6
v: v3
  • Loading branch information
Eric Miao authored and Eric Miao committed Jun 5, 2009
1 parent fe5cc4b commit 45a84cc
Show file tree
Hide file tree
Showing 24 changed files with 23 additions and 23 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: f23d4911319fdebffd0529b31bb66d324ef287e6
refs/heads/master: f0a83701399123b0e95cc4d949fcccf9941fd190
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/cm-x300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/ohci.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/pxa3xx_nand.h>

#include <asm/mach/map.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/corgi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include <asm/mach/irq.h>

#include <mach/pxa25x.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/irda.h>
#include <mach/mmc.h>
#include <mach/udc.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/csb726.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <asm/mach/arch.h>
#include <mach/csb726.h>
#include <mach/mfp-pxa27x.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/mmc.h>
#include <mach/ohci.h>
#include <mach/pxa2xx-regs.h>
Expand Down
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 @@ -8,7 +8,7 @@
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/ohci.h>
#include <mach/pxa27x_keypad.h>
#include <mach/pxa2xx_spi.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 @@ -41,7 +41,7 @@
#include <mach/ohci.h>
#include <mach/mmc.h>
#include <mach/pxa27x_keypad.h>
#include <mach/i2c.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 @@ -25,7 +25,7 @@
#include <mach/pxa27x.h>
#include <mach/pxafb.h>
#include <mach/ohci.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/hardware.h>
#include <mach/pxa27x_keypad.h>

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/imote2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include <asm/mach/flash.h>

#include <mach/pxa27x.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/udc.h>
#include <mach/mmc.h>
#include <mach/pxa2xx_spi.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/ssp.h>
#include <mach/pxa2xx_spi.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/pxa27x_keypad.h>
#include <mach/pxa3xx_nand.h>
#include <mach/littleton.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/magician.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <mach/pxa27x.h>
#include <mach/magician.h>
#include <mach/pxafb.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/ohci.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 @@ -46,7 +46,7 @@
#include <mach/mainstone.h>
#include <mach/audio.h>
#include <mach/pxafb.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/ohci.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 @@ -48,7 +48,7 @@
#include <mach/mmc.h>
#include <mach/udc.h>
#include <mach/pxa27x-udc.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/camera.h>
#include <mach/audio.h>
#include <media/soc_camera.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/pcm990-baseboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include <media/soc_camera.h>

#include <asm/gpio.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/camera.h>
#include <asm/mach/map.h>
#include <mach/pxa27x.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/poodle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#include <mach/pxa25x.h>
#include <mach/mmc.h>
#include <mach/udc.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/irda.h>
#include <mach/poodle.h>
#include <mach/pxafb.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/pxa27x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <mach/ohci.h>
#include <mach/pm.h>
#include <mach/dma.h>
#include <mach/i2c.h>
#include <plat/i2c.h>

#include "generic.h"
#include "devices.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/pxa3xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <mach/pm.h>
#include <mach/dma.h>
#include <mach/ssp.h>
#include <mach/i2c.h>
#include <plat/i2c.h>

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

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

#include "devices.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/spitz.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include <mach/pxa27x.h>
#include <mach/pxa27x-udc.h>
#include <mach/reset.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/irda.h>
#include <mach/mmc.h>
#include <mach/ohci.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/tosa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include <mach/pxa25x.h>
#include <mach/reset.h>
#include <mach/irda.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/mmc.h>
#include <mach/udc.h>
#include <mach/tosa_bt.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/trizeps4.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/ohci.h>
#include <mach/i2c.h>
#include <plat/i2c.h>

#include "generic.h"
#include "devices.h"
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/viper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include <mach/pxa25x.h>
#include <mach/audio.h>
#include <mach/pxafb.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/regs-uart.h>
#include <mach/viper.h>

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/zylonite_pxa300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <linux/gpio.h>

#include <mach/pxa300.h>
#include <mach/i2c.h>
#include <plat/i2c.h>
#include <mach/zylonite.h>

#include "generic.h"
Expand Down
0 trunk/arch/arm/mach-pxa/include/mach/i2c.h → trunk/arch/arm/plat-pxa/include/plat/i2c.h
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion trunk/drivers/i2c/busses/i2c-pxa.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#include <asm/irq.h>
#include <asm/io.h>
#include <mach/i2c.h>
#include <plat/i2c.h>

/*
* I2C register offsets will be shifted 0 or 1 bit left, depending on
Expand Down

0 comments on commit 45a84cc

Please sign in to comment.