diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-18 07:38:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-18 07:38:58 -0800 |
| commit | 70b99eff756e8995b607a9d33f242c1e4f480f32 (patch) | |
| tree | 23b62ad71f77f9cb44622d0be55ff3e4f7e55a00 /arch/powerpc/platforms/pseries/pci_dlpar.c | |
| parent | 0a5b871ea4c6bfb2723ac2ffc7ef5c32452abb89 (diff) | |
| parent | 0f6b77ca12bea571e0a97b0588f62aa5f6012d61 (diff) | |
| download | kernel_samsung_smdk4412-70b99eff756e8995b607a9d33f242c1e4f480f32.zip kernel_samsung_smdk4412-70b99eff756e8995b607a9d33f242c1e4f480f32.tar.gz kernel_samsung_smdk4412-70b99eff756e8995b607a9d33f242c1e4f480f32.tar.bz2 | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Update a BKL related comment
powerpc/mm: Fix module instruction tlb fault handling on Book-E 64
powerpc: Fix call to subpage_protection()
powerpc: Set CONFIG_32BIT on ppc32
powerpc/mm: Fix build error in setup_initial_memory_limit
powerpc/pseries: Don't override CONFIG_PPC_PSERIES_DEBUG
powerpc: Fix div64 in bootloader
Diffstat (limited to 'arch/powerpc/platforms/pseries/pci_dlpar.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/pci_dlpar.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c index 4b7a062..5fcc92a 100644 --- a/arch/powerpc/platforms/pseries/pci_dlpar.c +++ b/arch/powerpc/platforms/pseries/pci_dlpar.c @@ -25,8 +25,6 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#undef DEBUG - #include <linux/pci.h> #include <asm/pci-bridge.h> #include <asm/ppc-pci.h> |