Commit cb5f814b authored by Linus Torvalds's avatar Linus Torvalds

Revert double patch application.

Heh. usually these come through Andrew, but this time it was all me.

Noted by BenH.

Cset exclude: paulus@samba.org[torvalds]|ChangeSet|20041207181541|44524
parent 6695ad97
...@@ -1118,16 +1118,6 @@ static void __init prom_close_stdin(void) ...@@ -1118,16 +1118,6 @@ static void __init prom_close_stdin(void)
call_prom("close", 1, 0, val); call_prom("close", 1, 0, val);
} }
static void __init prom_close_stdin(void)
{
unsigned long offset = reloc_offset();
struct prom_t *_prom = PTRRELOC(&prom);
ihandle val;
if (prom_getprop(_prom->chosen, "stdin", &val, sizeof(val)) > 0)
call_prom("close", 1, 0, val);
}
static int __init prom_find_machine_type(void) static int __init prom_find_machine_type(void)
{ {
unsigned long offset = reloc_offset(); unsigned long offset = reloc_offset();
...@@ -1709,9 +1699,6 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, unsigned long ...@@ -1709,9 +1699,6 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, unsigned long
/* in case stdin is USB and still active on IBM machines... */ /* in case stdin is USB and still active on IBM machines... */
prom_close_stdin(); prom_close_stdin();
/* in case stdin is USB and still active on IBM machines... */
prom_close_stdin();
/* /*
* Call OF "quiesce" method to shut down pending DMA's from * Call OF "quiesce" method to shut down pending DMA's from
* devices etc... * devices etc...
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment