dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Paul Mackerras 2007-12-14 16:46:50 +11:00
parent eb8dc843fc c896862105
commit 280bb6b1f7
7 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/configs/mpc8272_ads_defconfig
View File

@ -1,7 +1,7 @@
#
# 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

6
arch/powerpc/configs/pq2fads_defconfig
View File

@ -1,7 +1,7 @@
#
# 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

12
arch/powerpc/kernel/ppc_ksyms.c
View File

@ -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);

3
arch/powerpc/math-emu/op-2.h
View File

@ -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)

3
arch/powerpc/sysdev/cpm2_common.c
View File

@ -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);

2
drivers/net/fs_enet/mac-scc.c
View File

@ -158,7 +158,7 @@ static int setup_data(struct net_device *dev)
{
struct fs_enet_private *fep = netdev_priv(dev);
#ifdef CONFIG_PPC_CPM_NEW_BINDING
#ifndef CONFIG_PPC_CPM_NEW_BINDING
struct fs_platform_info *fpi = fep->fpi;
fep->scc.idx = fs_get_scc_index(fpi->fs_no);

3
include/asm-powerpc/commproc.h
View File

@ -698,9 +698,6 @@ typedef struct risc_timer_pram {
#define CICR_IEN ((uint)0x00000080) /* Int. enable */
#define CICR_SPS ((uint)0x00000001) /* SCC Spread */
extern void cpm_install_handler(int vec, void (*handler)(void *), void *dev_id);
extern void cpm_free_handler(int vec);
#define IMAP_ADDR (get_immrbase())
#define CPM_PIN_INPUT 0