Merge branch 'virtex-for-2.6.24' of git://git.secretlab.ca/git/linux-…

…2.6-virtex into for-2.6.24-4xx
mrcsosa · Oct 11, 2007 · 0a2cdd8 · 0a2cdd8
2 parents cdec12a + 17c5c20
commit 0a2cdd8
Show file tree

Hide file tree

Showing 4 changed files with 203 additions and 84 deletions.
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -2306,7 +2306,7 @@ S:	Maintained
 LINUX FOR POWERPC EMBEDDED XILINX VIRTEX
 P:	Grant Likely
 M:	[email protected]
-W:	http://www.secretlab.ca/
+W:	http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
 L:	[email protected]
 S:	Maintained
 

diff --git a/arch/powerpc/boot/uartlite.c b/arch/powerpc/boot/uartlite.c
@@ -45,8 +45,8 @@ static void uartlite_putc(unsigned char c)
 
 static unsigned char uartlite_getc(void)
 {
-	u32 reg = ULITE_STATUS_RXVALID;
-	while (reg & ULITE_STATUS_RXVALID) /* spin on RXVALID bit */
+	u32 reg = 0;
+	while (!(reg & ULITE_STATUS_RXVALID)) /* spin waiting for RXVALID bit */
 		reg = in_be32(reg_base + ULITE_STATUS);
 	return in_be32(reg_base + ULITE_RX);
 }

diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
@@ -6,7 +6,6 @@ mpic-msi-obj-$(CONFIG_PCI_MSI)	+= mpic_msi.o mpic_u3msi.o
 obj-$(CONFIG_MPIC)		+= mpic.o $(mpic-msi-obj-y)
 
 obj-$(CONFIG_PPC_MPC106)	+= grackle.o
-obj-$(CONFIG_PPC_DCR)		+= dcr.o
 obj-$(CONFIG_PPC_DCR_NATIVE)	+= dcr-low.o
 obj-$(CONFIG_PPC_PMI)		+= pmi.o
 obj-$(CONFIG_U3_DART)		+= dart_iommu.o
@@ -33,6 +32,7 @@ endif
 ifeq ($(ARCH),powerpc)
 obj-$(CONFIG_CPM)		+= cpm_common.o
 obj-$(CONFIG_CPM2)		+= cpm2_common.o cpm2_pic.o
+obj-$(CONFIG_PPC_DCR)		+= dcr.o
 obj-$(CONFIG_8xx)		+= mpc8xx_pic.o commproc.o
 obj-$(CONFIG_UCODE_PATCH)	+= micropatch.o
 endif