diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/boot/uartlite.c | 4 | ||||
-rw-r--r-- | arch/powerpc/sysdev/Makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/boot/uartlite.c b/arch/powerpc/boot/uartlite.c index 38a470b329e3..46bed69b4169 100644 --- a/arch/powerpc/boot/uartlite.c +++ b/arch/powerpc/boot/uartlite.c | |||
@@ -45,8 +45,8 @@ static void uartlite_putc(unsigned char c) | |||
45 | 45 | ||
46 | static unsigned char uartlite_getc(void) | 46 | static unsigned char uartlite_getc(void) |
47 | { | 47 | { |
48 | u32 reg = ULITE_STATUS_RXVALID; | 48 | u32 reg = 0; |
49 | while (reg & ULITE_STATUS_RXVALID) /* spin on RXVALID bit */ | 49 | while (!(reg & ULITE_STATUS_RXVALID)) /* spin waiting for RXVALID bit */ |
50 | reg = in_be32(reg_base + ULITE_STATUS); | 50 | reg = in_be32(reg_base + ULITE_STATUS); |
51 | return in_be32(reg_base + ULITE_RX); | 51 | return in_be32(reg_base + ULITE_RX); |
52 | } | 52 | } |
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile index 52e93bca10ca..1a6f5641ebc8 100644 --- 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 | |||
6 | obj-$(CONFIG_MPIC) += mpic.o $(mpic-msi-obj-y) | 6 | obj-$(CONFIG_MPIC) += mpic.o $(mpic-msi-obj-y) |
7 | 7 | ||
8 | obj-$(CONFIG_PPC_MPC106) += grackle.o | 8 | obj-$(CONFIG_PPC_MPC106) += grackle.o |
9 | obj-$(CONFIG_PPC_DCR) += dcr.o | ||
10 | obj-$(CONFIG_PPC_DCR_NATIVE) += dcr-low.o | 9 | obj-$(CONFIG_PPC_DCR_NATIVE) += dcr-low.o |
11 | obj-$(CONFIG_PPC_PMI) += pmi.o | 10 | obj-$(CONFIG_PPC_PMI) += pmi.o |
12 | obj-$(CONFIG_U3_DART) += dart_iommu.o | 11 | obj-$(CONFIG_U3_DART) += dart_iommu.o |
@@ -33,6 +32,7 @@ endif | |||
33 | ifeq ($(ARCH),powerpc) | 32 | ifeq ($(ARCH),powerpc) |
34 | obj-$(CONFIG_CPM) += cpm_common.o | 33 | obj-$(CONFIG_CPM) += cpm_common.o |
35 | obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o | 34 | obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o |
35 | obj-$(CONFIG_PPC_DCR) += dcr.o | ||
36 | obj-$(CONFIG_8xx) += mpc8xx_pic.o commproc.o | 36 | obj-$(CONFIG_8xx) += mpc8xx_pic.o commproc.o |
37 | obj-$(CONFIG_UCODE_PATCH) += micropatch.o | 37 | obj-$(CONFIG_UCODE_PATCH) += micropatch.o |
38 | endif | 38 | endif |