Commit 280bb6b1 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge

parents eb8dc843 c8968621
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24-rc4
# Thu Dec  6 16:48:30 2007
# Linux kernel version: 2.6.24-rc5
# Thu Dec 13 22:40:57 2007
#
# CONFIG_PPC64 is not set

@@ -491,7 +491,7 @@ CONFIG_MII=y
CONFIG_FS_ENET=y
# CONFIG_FS_ENET_HAS_SCC is not set
CONFIG_FS_ENET_HAS_FCC=y
# CONFIG_FS_ENET_MDIO_FCC is not set
CONFIG_FS_ENET_MDIO_FCC=y
CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
+3 −3
Original line number Diff line number Diff line
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24-rc4
# Thu Dec  6 16:49:09 2007
# Linux kernel version: 2.6.24-rc5
# Thu Dec 13 22:39:18 2007
#
# CONFIG_PPC64 is not set

@@ -548,7 +548,7 @@ CONFIG_MII=y
CONFIG_FS_ENET=y
# CONFIG_FS_ENET_HAS_SCC is not set
CONFIG_FS_ENET_HAS_FCC=y
# CONFIG_FS_ENET_MDIO_FCC is not set
CONFIG_FS_ENET_MDIO_FCC=y
CONFIG_NETDEV_1000=y
# CONFIG_ACENIC is not set
# CONFIG_DL2K is not set
+0 −12
Original line number Diff line number Diff line
@@ -45,10 +45,6 @@
#include <asm/signal.h>
#include <asm/dcr.h>

#ifdef  CONFIG_8xx
#include <asm/commproc.h>
#endif

#ifdef CONFIG_PPC64
EXPORT_SYMBOL(local_irq_restore);
#endif
@@ -172,14 +168,6 @@ EXPORT_SYMBOL(console_drivers);
EXPORT_SYMBOL(cacheable_memcpy);
#endif

#ifdef  CONFIG_8xx
EXPORT_SYMBOL(cpm_install_handler);
EXPORT_SYMBOL(cpm_free_handler);
#endif /* CONFIG_8xx */
#if defined(CONFIG_8xx)
EXPORT_SYMBOL(__res);
#endif

#ifdef CONFIG_PPC32
EXPORT_SYMBOL(next_mmu_context);
EXPORT_SYMBOL(set_context);
+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@
    else								\
      {									\
	X##_f0 = (X##_f1 >> ((N) - _FP_W_TYPE_SIZE) |			\
	          (((X##_f1 << (sz - (N))) | X##_f0) != 0));		\
	          (((X##_f1 << (2 * _FP_W_TYPE_SIZE - (N))) |		\
		   X##_f0) != 0));					\
	X##_f1 = 0;							\
      }									\
  } while (0)
+1 −2
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ cpm2_map_t __iomem *cpm2_immr;
					   of space for CPM as it is larger
					   than on PQ2 */

void
cpm2_reset(void)
void __init cpm2_reset(void)
{
#ifdef CONFIG_PPC_85xx
	cpm2_immr = ioremap(CPM_MAP_ADDR, CPM_MAP_SIZE);
Loading