diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/asm-arm/arch-pxa/zylonite.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/asm-arm/arch-pxa/zylonite.h')
| -rw-r--r-- | include/asm-arm/arch-pxa/zylonite.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-arm/arch-pxa/zylonite.h b/include/asm-arm/arch-pxa/zylonite.h index 4881b80f0f90..0d35ca04731e 100644 --- a/include/asm-arm/arch-pxa/zylonite.h +++ b/include/asm-arm/arch-pxa/zylonite.h | |||
| @@ -15,8 +15,9 @@ struct platform_mmc_slot { | |||
| 15 | 15 | ||
| 16 | extern struct platform_mmc_slot zylonite_mmc_slot[]; | 16 | extern struct platform_mmc_slot zylonite_mmc_slot[]; |
| 17 | 17 | ||
| 18 | extern int gpio_backlight; | ||
| 19 | extern int gpio_eth_irq; | 18 | extern int gpio_eth_irq; |
| 19 | extern int gpio_debug_led1; | ||
| 20 | extern int gpio_debug_led2; | ||
| 20 | 21 | ||
| 21 | extern int wm9713_irq; | 22 | extern int wm9713_irq; |
| 22 | 23 | ||