diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 09:15:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 09:15:35 +0100 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /arch/m68knommu/platform/5307/config.c | |
| parent | tun: Check supplemental groups in TUN/TAP driver. (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds... (diff) | |
| download | linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.xz linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'arch/m68knommu/platform/5307/config.c')
| -rw-r--r-- | arch/m68knommu/platform/5307/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68knommu/platform/5307/config.c b/arch/m68knommu/platform/5307/config.c index 11cff6625dcc..724faf05852a 100644 --- a/arch/m68knommu/platform/5307/config.c +++ b/arch/m68knommu/platform/5307/config.c @@ -123,7 +123,7 @@ void __init config_BSP(char *commandp, int size) { mcf_setimr(MCFSIM_IMR_MASKALL); -#if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \ +#if defined(CONFIG_NETtel) || \ defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA) /* Copy command line from FLASH to local buffer... */ memcpy(commandp, (char *) 0xf0004000, size); |