diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /arch/arm/mach-pxa/palmld.c | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'arch/arm/mach-pxa/palmld.c')
| -rw-r--r-- | arch/arm/mach-pxa/palmld.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c index ed70f281dd09..169fcc18154e 100644 --- a/arch/arm/mach-pxa/palmld.c +++ b/arch/arm/mach-pxa/palmld.c | |||
| @@ -128,6 +128,10 @@ static unsigned long palmld_pin_config[] __initdata = { | |||
| 128 | GPIO38_GPIO, /* wifi ready */ | 128 | GPIO38_GPIO, /* wifi ready */ |
| 129 | GPIO81_GPIO, /* wifi reset */ | 129 | GPIO81_GPIO, /* wifi reset */ |
| 130 | 130 | ||
| 131 | /* FFUART */ | ||
| 132 | GPIO34_FFUART_RXD, | ||
| 133 | GPIO39_FFUART_TXD, | ||
| 134 | |||
| 131 | /* HDD */ | 135 | /* HDD */ |
| 132 | GPIO98_GPIO, /* HDD reset */ | 136 | GPIO98_GPIO, /* HDD reset */ |
| 133 | GPIO115_GPIO, /* HDD power */ | 137 | GPIO115_GPIO, /* HDD power */ |