diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-05 18:22:26 -0500 |
| commit | 28b4d5cc17c20786848cdc07b7ea237a309776bb (patch) | |
| tree | bae406a4b17229dcce7c11be5073f7a67665e477 /arch/powerpc | |
| parent | d29cecda036f251aee4947f47eea0fe9ed8cc931 (diff) | |
| parent | 96fa2b508d2d3fe040cf4ef2fffb955f0a537ea1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/pcmcia/fmvj18x_cs.c
drivers/net/pcmcia/nmclan_cs.c
drivers/net/pcmcia/xirc2ps_cs.c
drivers/net/wireless/ray_cs.c
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 53bcf3d792db..b152de3e64d4 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
| @@ -345,7 +345,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 345 | 345 | ||
| 346 | #ifdef CONFIG_SWIOTLB | 346 | #ifdef CONFIG_SWIOTLB |
| 347 | if (ppc_swiotlb_enable) | 347 | if (ppc_swiotlb_enable) |
| 348 | swiotlb_init(); | 348 | swiotlb_init(1); |
| 349 | #endif | 349 | #endif |
| 350 | 350 | ||
| 351 | paging_init(); | 351 | paging_init(); |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 04f638d82fb3..df2c9e932b37 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
| @@ -550,7 +550,7 @@ void __init setup_arch(char **cmdline_p) | |||
| 550 | 550 | ||
| 551 | #ifdef CONFIG_SWIOTLB | 551 | #ifdef CONFIG_SWIOTLB |
| 552 | if (ppc_swiotlb_enable) | 552 | if (ppc_swiotlb_enable) |
| 553 | swiotlb_init(); | 553 | swiotlb_init(1); |
| 554 | #endif | 554 | #endif |
| 555 | 555 | ||
| 556 | paging_init(); | 556 | paging_init(); |