diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
| commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
| tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /arch/ppc/boot/vreset.c | |
| parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) | |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'arch/ppc/boot/vreset.c')
| -rw-r--r-- | arch/ppc/boot/vreset.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/arch/ppc/boot/vreset.c b/arch/ppc/boot/vreset.c index 6086372a0..c01361dc6 100644 --- a/arch/ppc/boot/vreset.c +++ b/arch/ppc/boot/vreset.c @@ -416,7 +416,6 @@ unsigned char AC[21] = { static int scanPCI(int start_slt); static int PCIVendor(int); static void printslots(void); -int delayLoop(int); extern void puthex(unsigned long); extern void puts(const char *); static void unlockS3(void); @@ -495,7 +494,7 @@ vga_init(unsigned char *ISA_mem) puts("VGA Chip Vendor ID: "); puthex(PCIVendor(slot)); puts("\n"); - delayLoop(1); + mdelay(1000); #endif }; @@ -513,10 +512,10 @@ vga_init(unsigned char *ISA_mem) #ifdef DEBUG printslots(); - delayLoop(5); + mdelay(5000); #endif - delayLoop(1); /* give time for the video monitor to come up */ + mdelay(1000); /* give time for the video monitor to come up */ } return (1); /* 'CRT' I/O supported */ } @@ -806,21 +805,6 @@ scanPCI(int start_slt) return ( theSlot ); } -/* Delay for a certain number of seconds */ -/* Note: They loop is used since 'udelay' can't handle really long counts! */ - -int -delayLoop(int k) -{ - int i; - while (k-- > 0) { - for (i = 0; i < 1000; i++) { - udelay(1000); - } - } -} - - /* return Vendor ID of card in the slot */ static int PCIVendor(int slotnum) { |