Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 327135
b: refs/heads/master
c: 293b2da
h: refs/heads/master
i:
  327133: e211c29
  327131: 62a7958
  327127: 113f18b
  327119: 038cc70
  327103: 88dbcc5
v: v3
  • Loading branch information
Arnd Bergmann committed Sep 14, 2012
1 parent 21f8ab6 commit bb65e8d
Show file tree
Hide file tree
Showing 87 changed files with 189 additions and 189 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: 2960ed3468773b1a0b2533dd7a562673cc799437
refs/heads/master: 293b2da1b61136813fc2764f43304c66ff8040e9
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mmp/aspenite.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include <mach/irqs.h>
#include <video/pxa168fb.h>
#include <linux/input.h>
#include <plat/pxa27x_keypad.h>
#include <linux/platform_data/keypad-pxa27x.h>

#include "common.h"

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mmp/include/mach/mmp2.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern void mmp2_clear_pmic_int(void);
#include <linux/i2c.h>
#include <linux/i2c/pxa-i2c.h>
#include <mach/devices.h>
#include <mach/sram.h>
#include <linux/platform_data/dma-mmp_tdma.h>

extern struct pxa_device_desc mmp2_device_uart1;
extern struct pxa_device_desc mmp2_device_uart2;
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-mmp/include/mach/pxa168.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ extern void pxa168_clear_keypad_wakeup(void);
#include <linux/i2c.h>
#include <linux/i2c/pxa-i2c.h>
#include <mach/devices.h>
#include <plat/pxa3xx_nand.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>
#include <video/pxa168fb.h>
#include <plat/pxa27x_keypad.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <mach/cputype.h>
#include <linux/pxa168_eth.h>
#include <linux/platform_data/mv_usb.h>
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mmp/include/mach/pxa910.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ extern void __init pxa910_init_irq(void);
#include <linux/i2c.h>
#include <linux/i2c/pxa-i2c.h>
#include <mach/devices.h>
#include <plat/pxa3xx_nand.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>

extern struct pxa_device_desc pxa910_device_uart1;
extern struct pxa_device_desc pxa910_device_uart2;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mmp/sram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <linux/slab.h>
#include <linux/genalloc.h>

#include <mach/sram.h>
#include <linux/platform_data/dma-mmp_tdma.h>

struct sram_bank_info {
char *pool_name;
Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mmp/teton_bga.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <linux/platform_device.h>
#include <linux/gpio.h>
#include <linux/input.h>
#include <plat/pxa27x_keypad.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/i2c.h>

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

#include <mach/pxa25x.h>
#include <mach/gumstix.h>
#include <mach/pxafb.h>
#include <linux/platform_data/video-pxafb.h>

#include "generic.h"

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/am300epd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

#include <mach/gumstix.h>
#include <mach/mfp-pxa25x.h>
#include <mach/pxafb.h>
#include <linux/platform_data/video-pxafb.h>

#include "generic.h"

Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/arm/mach-pxa/balloon3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
#include <mach/pxa27x.h>
#include <mach/balloon3.h>
#include <mach/audio.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <mach/udc.h>
#include <mach/pxa27x-udc.h>
#include <mach/irda.h>
#include <mach/ohci.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>

#include "generic.h"
#include "devices.h"
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-pxa/cm-x270.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include <linux/spi/libertas_spi.h>

#include <mach/pxa27x.h>
#include <mach/ohci.h>
#include <mach/mmc.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/mmc-pxamci.h>

#include "generic.h"

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/cm-x2xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <mach/pxa25x.h>
#include <mach/pxa27x.h>
#include <mach/audio.h>
#include <mach/pxafb.h>
#include <linux/platform_data/video-pxafb.h>
#include <mach/smemc.h>

#include <asm/hardware/it8152.h>
Expand Down
10 changes: 5 additions & 5 deletions trunk/arch/arm/mach-pxa/cm-x300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@

#include <mach/pxa300.h>
#include <mach/pxa27x-udc.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/ohci.h>
#include <plat/pxa3xx_nand.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>
#include <mach/audio.h>
#include <mach/pxa3xx-u2d.h>
#include <linux/platform_data/usb-pxa3xx-ulpi.h>

#include <asm/mach/map.h>

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-pxa/colibri-evalboard.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

#include <mach/pxa27x.h>
#include <mach/colibri.h>
#include <mach/mmc.h>
#include <mach/ohci.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/pxa27x-udc.h>

#include "generic.h"
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-pxa/colibri-pxa270-income.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
#include <asm/mach-types.h>

#include <mach/hardware.h>
#include <mach/mmc.h>
#include <mach/ohci.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/pxa27x.h>
#include <mach/pxa27x-udc.h>
#include <mach/pxafb.h>
#include <linux/platform_data/video-pxafb.h>

#include "devices.h"
#include "generic.h"
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-pxa/colibri-pxa300.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

#include <mach/pxa300.h>
#include <mach/colibri.h>
#include <mach/ohci.h>
#include <mach/pxafb.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/video-pxafb.h>
#include <mach/audio.h>

#include "generic.h"
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-pxa/colibri-pxa320.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

#include <mach/pxa320.h>
#include <mach/colibri.h>
#include <mach/pxafb.h>
#include <mach/ohci.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/audio.h>
#include <mach/pxa27x-udc.h>
#include <mach/udc.h>
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-pxa/colibri-pxa3xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#include <mach/pxa3xx-regs.h>
#include <mach/mfp-pxa300.h>
#include <mach/colibri.h>
#include <mach/mmc.h>
#include <mach/pxafb.h>
#include <plat/pxa3xx_nand.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>

#include "generic.h"
#include "devices.h"
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-pxa/corgi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
#include <asm/mach/irq.h>

#include <mach/pxa25x.h>
#include <mach/irda.h>
#include <mach/mmc.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <mach/udc.h>
#include <mach/corgi.h>
#include <mach/sharpsl_pm.h>
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-pxa/csb726.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <asm/mach/arch.h>
#include <mach/csb726.h>
#include <mach/pxa27x.h>
#include <mach/mmc.h>
#include <mach/ohci.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/audio.h>
#include <mach/smemc.h>

Expand Down
16 changes: 8 additions & 8 deletions trunk/arch/arm/mach-pxa/devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@

#include <asm/pmu.h>
#include <mach/udc.h>
#include <mach/pxa3xx-u2d.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/irda.h>
#include <linux/platform_data/usb-pxa3xx-ulpi.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <mach/irqs.h>
#include <mach/ohci.h>
#include <plat/pxa27x_keypad.h>
#include <mach/camera.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/camera-pxa.h>
#include <mach/audio.h>
#include <mach/hardware.h>
#include <plat/pxa3xx_nand.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>

#include "devices.h"
#include "generic.h"
Expand Down
10 changes: 5 additions & 5 deletions trunk/arch/arm/mach-pxa/em-x270.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
#include <mach/pxa27x.h>
#include <mach/pxa27x-udc.h>
#include <mach/audio.h>
#include <mach/pxafb.h>
#include <mach/ohci.h>
#include <mach/mmc.h>
#include <plat/pxa27x_keypad.h>
#include <mach/camera.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/camera-pxa.h>

#include "generic.h"
#include "devices.h"
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-pxa/eseries.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
#include <mach/eseries-gpio.h>
#include <mach/eseries-irq.h>
#include <mach/audio.h>
#include <mach/pxafb.h>
#include <linux/platform_data/video-pxafb.h>
#include <mach/udc.h>
#include <mach/irda.h>
#include <linux/platform_data/irda-pxaficp.h>

#include "devices.h"
#include "generic.h"
Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/arm/mach-pxa/ezx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
#include <asm/mach/arch.h>

#include <mach/pxa27x.h>
#include <mach/pxafb.h>
#include <mach/ohci.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/hardware.h>
#include <plat/pxa27x_keypad.h>
#include <mach/camera.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/camera-pxa.h>

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

#include <mach/pxa25x.h>
#include <mach/mmc.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <mach/udc.h>
#include <mach/gumstix.h>

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-pxa/hx4700.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/hx4700.h>
#include <mach/irda.h>
#include <linux/platform_data/irda-pxaficp.h>

#include <sound/ak4641.h>
#include <video/platform_lcd.h>
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/mach-pxa/idp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@

#include <mach/pxa25x.h>
#include <mach/idp.h>
#include <mach/pxafb.h>
#include <linux/platform_data/video-pxafb.h>
#include <mach/bitfield.h>
#include <mach/mmc.h>
#include <linux/platform_data/mmc-pxamci.h>

#include "generic.h"
#include "devices.h"
Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/arm/mach-pxa/littleton.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
#include <asm/mach/irq.h>

#include <mach/pxa300.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <plat/pxa27x_keypad.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <mach/littleton.h>
#include <plat/pxa3xx_nand.h>
#include <linux/platform_data/mtd-nand-pxa3xx.h>

#include "generic.h"

Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/arm/mach-pxa/lpd270.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
#include <mach/pxa27x.h>
#include <mach/lpd270.h>
#include <mach/audio.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/ohci.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/smemc.h>

#include "generic.h"
Expand Down
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-pxa/lubbock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
#include <mach/audio.h>
#include <mach/lubbock.h>
#include <mach/udc.h>
#include <mach/irda.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <mach/pm.h>
#include <mach/smemc.h>

Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/arm/mach-pxa/magician.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@

#include <mach/pxa27x.h>
#include <mach/magician.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/ohci.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>

#include "devices.h"
#include "generic.h"
Expand Down
10 changes: 5 additions & 5 deletions trunk/arch/arm/mach-pxa/mainstone.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@
#include <mach/pxa27x.h>
#include <mach/mainstone.h>
#include <mach/audio.h>
#include <mach/pxafb.h>
#include <mach/mmc.h>
#include <mach/irda.h>
#include <mach/ohci.h>
#include <plat/pxa27x_keypad.h>
#include <linux/platform_data/video-pxafb.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/irda-pxaficp.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <mach/smemc.h>

#include "generic.h"
Expand Down
Loading

0 comments on commit bb65e8d

Please sign in to comment.