Merge branch 'depends/rmk/gpio' into next/board

Browse source

Conflicts:
	arch/arm/mach-at91/board-usb-a9260.c
	arch/arm/mach-at91/board-usb-a9263.c
	arch/arm/mach-tegra/board-paz00.h
	arch/arm/mach-tegra/board-seaboard.h

...

This commit is contained in:

Arnd Bergmann 2011-10-21 16:46:26 +02:00

parent 3b3c281073 f55be1bf52

commit 335332770c

267 changed files with 3948 additions and 4025 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/arm/Kconfig

View file

2

arch/arm/common/scoop.c

View file

19

arch/arm/include/asm/gpio.h

View file

2

arch/arm/include/asm/hardware/iop3xx-gpio.h

View file

2

arch/arm/mach-at91/at91cap9_devices.c

View file

2

arch/arm/mach-at91/at91rm9200_devices.c

View file

2

arch/arm/mach-at91/at91sam9260_devices.c

View file

2

arch/arm/mach-at91/at91sam9261_devices.c

View file

2

arch/arm/mach-at91/at91sam9263_devices.c

View file

2

arch/arm/mach-at91/at91sam9g45_devices.c

View file

2

arch/arm/mach-at91/at91sam9rl_devices.c

View file

2

arch/arm/mach-at91/board-1arm.c

View file

2

arch/arm/mach-at91/board-afeb-9260v1.c

View file

2

arch/arm/mach-at91/board-cam60.c

View file

2

arch/arm/mach-at91/board-cap9adk.c

View file

2

arch/arm/mach-at91/board-carmeva.c

View file

2

arch/arm/mach-at91/board-cpu9krea.c

View file

2

arch/arm/mach-at91/board-cpuat91.c

View file

2

arch/arm/mach-at91/board-csb337.c

View file

2

arch/arm/mach-at91/board-csb637.c

View file

2

arch/arm/mach-at91/board-eb9200.c

View file

2

arch/arm/mach-at91/board-ecbat91.c

View file

2

arch/arm/mach-at91/board-kafa.c

View file

2

arch/arm/mach-at91/board-kb9202.c

View file

2

arch/arm/mach-at91/board-neocore926.c

View file

2

arch/arm/mach-at91/board-picotux200.c

View file

2

arch/arm/mach-at91/board-qil-a9260.c

View file

2

arch/arm/mach-at91/board-rm9200dk.c

View file

2

arch/arm/mach-at91/board-rm9200ek.c

View file

2

arch/arm/mach-at91/board-sam9-l9260.c

View file

2

arch/arm/mach-at91/board-sam9260ek.c

View file

2

arch/arm/mach-at91/board-sam9261ek.c

View file

2

arch/arm/mach-at91/board-sam9263ek.c

View file

2

arch/arm/mach-at91/board-sam9g20ek.c

View file

2

arch/arm/mach-at91/board-sam9m10g45ek.c

View file

2

arch/arm/mach-at91/board-sam9rlek.c

View file

2

arch/arm/mach-at91/board-usb-a926x.c

View file

2

arch/arm/mach-at91/board-yl-9200.c

View file

4

arch/arm/mach-at91/gpio.c

View file

5

arch/arm/mach-at91/include/mach/gpio.h

View file

2

arch/arm/mach-at91/leds.c

View file

2

arch/arm/mach-at91/pm.c

View file

3

arch/arm/mach-davinci/Makefile

View file

3

arch/arm/mach-davinci/da830.c

View file

3

arch/arm/mach-davinci/da850.c

View file

2

arch/arm/mach-davinci/dm355.c

View file

3

arch/arm/mach-davinci/dm365.c

View file

2

arch/arm/mach-davinci/dm644x.c

View file

2

arch/arm/mach-davinci/dm646x.c

View file

91

arch/arm/mach-davinci/include/mach/gpio-davinci.h

View file

79

arch/arm/mach-davinci/include/mach/gpio.h

View file

3

arch/arm/mach-davinci/tnetv107x.c

View file

1

arch/arm/mach-ep93xx/core.c

View file

1

arch/arm/mach-ep93xx/edb93xx.c

View file

28

arch/arm/mach-ep93xx/include/mach/gpio.h → arch/arm/mach-ep93xx/include/mach/gpio-ep93xx.h

View file

2

arch/arm/mach-ep93xx/simone.c

View file

2

arch/arm/mach-ep93xx/snappercl15.c

View file

7

arch/arm/mach-exynos4/include/mach/gpio.h

View file

5

arch/arm/mach-gemini/include/mach/gpio.h

View file

3

arch/arm/mach-imx/iomux-imx31.c

View file

3

arch/arm/mach-imx/mach-mx27ads.c

View file

4

arch/arm/mach-ixp2000/core.c

View file

4

arch/arm/mach-ixp2000/include/mach/gpio.h → arch/arm/mach-ixp2000/include/mach/gpio-ixp2000.h

View file

4

arch/arm/mach-ixp2000/ixdp2x00.c

View file

3

arch/arm/mach-ixp4xx/dsmg600-setup.c

View file

3

arch/arm/mach-ixp4xx/fsg-setup.c

View file

3

arch/arm/mach-ixp4xx/include/mach/gpio.h

View file

3

arch/arm/mach-ixp4xx/nas100d-setup.c

View file

3

arch/arm/mach-ixp4xx/nslu2-setup.c

View file

3

arch/arm/mach-kirkwood/irq.c

View file

3

arch/arm/mach-kirkwood/mpp.c

View file

2

arch/arm/mach-ks8695/Makefile

View file

4

arch/arm/mach-ks8695/board-acs5k.c

View file

4

arch/arm/mach-ks8695/board-dsm320.c

View file

4

arch/arm/mach-ks8695/board-micrel.c

View file

1

arch/arm/mach-ks8695/devices.c

View file

39

arch/arm/mach-ks8695/include/mach/gpio-ks8695.h

View file

38

arch/arm/mach-ks8695/include/mach/gpio.h

View file

4

arch/arm/mach-ks8695/leds.c

View file

2

arch/arm/mach-lpc32xx/Makefile

View file

50

arch/arm/mach-lpc32xx/include/mach/gpio-lpc32xx.h

View file

74

arch/arm/mach-lpc32xx/include/mach/gpio.h

View file

1

arch/arm/mach-lpc32xx/phy3250.c

View file

4

arch/arm/mach-mmp/aspenite.c

View file

1

arch/arm/mach-mmp/brownstone.c

View file

2

arch/arm/mach-mmp/gplugd.c

View file

30

arch/arm/mach-mmp/include/mach/gpio-pxa.h

View file

23

arch/arm/mach-mmp/include/mach/gpio.h

View file

1

arch/arm/mach-mmp/jasper.c

View file

3

arch/arm/mach-mmp/mmp2.c

View file

3

arch/arm/mach-mmp/pxa168.c

View file

3

arch/arm/mach-mmp/pxa910.c

View file

4

arch/arm/mach-mmp/tavorevb.c

View file

3

arch/arm/mach-msm/board-msm7x27.c

View file

3

arch/arm/mach-msm/board-msm7x30.c

View file

3

arch/arm/mach-msm/board-qsd8x50.c

View file

3

arch/arm/mach-msm/board-sapphire.c

View file

3

arch/arm/mach-msm/board-trout-mmc.c

View file

3

arch/arm/mach-msm/board-trout-panel.c

View file

27

arch/arm/mach-msm/include/mach/gpio.h

View file

Some files were not shown because too many files have changed in this diff Show more