diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-24 23:15:15 -0400 |
| commit | c373ba999103fa794f041eab5bd490714d2dee88 (patch) | |
| tree | 8f2b445b1e0af2491c83527967dbcda76054a486 /arch/arm/mach-pxa/devices.h | |
| parent | 6f3529f00a0a9ac06413d18d3926adf099cb59af (diff) | |
| parent | 851b147e4411df6a1e7e90e2a609773c277eefd2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-pxa/devices.h')
| -rw-r--r-- | arch/arm/mach-pxa/devices.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h index ecc24a4dca6d..93817d99761e 100644 --- a/arch/arm/mach-pxa/devices.h +++ b/arch/arm/mach-pxa/devices.h | |||
| @@ -35,4 +35,6 @@ extern struct platform_device pxa27x_device_pwm1; | |||
| 35 | extern struct platform_device pxa3xx_device_nand; | 35 | extern struct platform_device pxa3xx_device_nand; |
| 36 | extern struct platform_device pxa3xx_device_i2c_power; | 36 | extern struct platform_device pxa3xx_device_i2c_power; |
| 37 | 37 | ||
| 38 | extern struct platform_device pxa3xx_device_gcu; | ||
| 39 | |||
| 38 | void __init pxa_register_device(struct platform_device *dev, void *data); | 40 | void __init pxa_register_device(struct platform_device *dev, void *data); |