diff options
| author | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-06-08 14:13:36 +0530 |
|---|---|---|
| committer | Chirayu Desai <cdesai@cyanogenmod.org> | 2013-06-08 14:13:36 +0530 |
| commit | 0ea6eab87c85317af3fc549950715b9e42795706 (patch) | |
| tree | 59668f4c72c2a3b5640ae212864013644b6911ce /arch/arm | |
| parent | ad5ca4cbf2df1d5e30269097e57ddbf13d8c189d (diff) | |
| parent | 1e18293a23fdc4e28b07302ad6a5ed99f7a26348 (diff) | |
| download | kernel_samsung_aries-0ea6eab87c85317af3fc549950715b9e42795706.zip kernel_samsung_aries-0ea6eab87c85317af3fc549950715b9e42795706.tar.gz kernel_samsung_aries-0ea6eab87c85317af3fc549950715b9e42795706.tar.bz2 | |
Merge tag 'v3.0.81' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD
This is the 3.0.81 stable release
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-kirkwood/ts219-setup.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-orion/common.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c index 68f32f2..eb1a7ba 100644 --- a/arch/arm/mach-kirkwood/ts219-setup.c +++ b/arch/arm/mach-kirkwood/ts219-setup.c @@ -124,7 +124,7 @@ static void __init qnap_ts219_init(void) static int __init ts219_pci_init(void) { if (machine_is_ts219()) - kirkwood_pcie_init(KW_PCIE0); + kirkwood_pcie_init(KW_PCIE1 | KW_PCIE0); return 0; } diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index 11dce87..214b002 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c @@ -343,7 +343,7 @@ static struct resource orion_ge10_shared_resources[] = { static struct platform_device orion_ge10_shared = { .name = MV643XX_ETH_SHARED_NAME, - .id = 1, + .id = 2, .dev = { .platform_data = &orion_ge10_shared_data, }, @@ -358,8 +358,8 @@ static struct resource orion_ge10_resources[] = { static struct platform_device orion_ge10 = { .name = MV643XX_ETH_NAME, - .id = 1, - .num_resources = 2, + .id = 2, + .num_resources = 1, .resource = orion_ge10_resources, .dev = { .coherent_dma_mask = DMA_BIT_MASK(32), @@ -397,7 +397,7 @@ static struct resource orion_ge11_shared_resources[] = { static struct platform_device orion_ge11_shared = { .name = MV643XX_ETH_SHARED_NAME, - .id = 1, + .id = 3, .dev = { .platform_data = &orion_ge11_shared_data, }, @@ -412,8 +412,8 @@ static struct resource orion_ge11_resources[] = { static struct platform_device orion_ge11 = { .name = MV643XX_ETH_NAME, - .id = 1, - .num_resources = 2, + .id = 3, + .num_resources = 1, .resource = orion_ge11_resources, .dev = { .coherent_dma_mask = DMA_BIT_MASK(32), |