diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 17:24:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 17:24:51 +0100 |
| commit | 290815710b51de23f9ed6799d3e0bb762d4f907c (patch) | |
| tree | ba6e0420ee3b5e8b9326ecf1274b71e9f4cc06d3 /arch/arm/mach-kirkwood/ts219-setup.c | |
| parent | 14f0aa359365e8a93a77b71e3b840274b9b4dcb1 (diff) | |
| parent | a49a018a6ea6d73742a81d673fe5ec4a7d2137b3 (diff) | |
| download | op-kernel-dev-290815710b51de23f9ed6799d3e0bb762d4f907c.zip op-kernel-dev-290815710b51de23f9ed6799d3e0bb762d4f907c.tar.gz | |
Merge branch 'for-rmk' of git://git.marvell.com/orion
Diffstat (limited to 'arch/arm/mach-kirkwood/ts219-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/ts219-setup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c index dda5743..01aa213 100644 --- a/arch/arm/mach-kirkwood/ts219-setup.c +++ b/arch/arm/mach-kirkwood/ts219-setup.c @@ -142,6 +142,8 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = { MPP1_SPI_MOSI, MPP2_SPI_SCK, MPP3_SPI_MISO, + MPP4_SATA1_ACTn, + MPP5_SATA0_ACTn, MPP8_TW_SDA, MPP9_TW_SCK, MPP10_UART0_TXD, @@ -150,10 +152,6 @@ static unsigned int qnap_ts219_mpp_config[] __initdata = { MPP14_UART1_RXD, /* PIC controller */ MPP15_GPIO, /* USB Copy button */ MPP16_GPIO, /* Reset button */ - MPP20_SATA1_ACTn, - MPP21_SATA0_ACTn, - MPP22_SATA1_PRESENTn, - MPP23_SATA0_PRESENTn, 0 }; |
