git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.37-rc2' into sched/core
[pandora-kernel.git]
/
arch
/
m68knommu
/
platform
/
68VZ328
/
config.c
diff --git
a/arch/m68knommu/platform/68VZ328/config.c
b/arch/m68knommu/platform/68VZ328/config.c
index
fc5c630
..
eabaabe
100644
(file)
--- a/
arch/m68knommu/platform/68VZ328/config.c
+++ b/
arch/m68knommu/platform/68VZ328/config.c
@@
-90,11
+90,6
@@
static void init_hardware(char *command, int size)
PDIQEG &= ~PD(1);
PDIRQEN |= PD(1); /* IRQ enabled */
PDIQEG &= ~PD(1);
PDIRQEN |= PD(1); /* IRQ enabled */
-#ifdef CONFIG_68328_SERIAL_UART2
- /* Enable RXD TXD port bits to enable UART2 */
- PJSEL &= ~(PJ(5) | PJ(4));
-#endif
-
#ifdef CONFIG_INIT_LCD
/* initialize LCD controller */
LSSA = (long) screen_bits;
#ifdef CONFIG_INIT_LCD
/* initialize LCD controller */
LSSA = (long) screen_bits;