diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-09-23 17:05:22 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-09-23 17:05:22 +0000 |
| commit | 732d43cbb57dfa099ec0ffee71d4002d9ece9eec (patch) | |
| tree | 5b15dcc89771d193f873453ff9b3d479bfc5fdcf | |
| parent | 3a05ce60eb1380a3a7203388ff63847fa8ab2b60 (diff) | |
| download | anaconda-732d43cbb57dfa099ec0ffee71d4002d9ece9eec.tar.gz anaconda-732d43cbb57dfa099ec0ffee71d4002d9ece9eec.tar.xz anaconda-732d43cbb57dfa099ec0ffee71d4002d9ece9eec.zip | |
* loader2/loader.c: Don't load parallel port module. (#169135)
* loader2/loader.h (LOADER_FLAGS_NOPARPORT): Remove unused flag.
* loader2/hardware.c (initializeParallelPort): Remove unused code.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | loader2/hardware.c | 19 | ||||
| -rw-r--r-- | loader2/loader.c | 2 | ||||
| -rw-r--r-- | loader2/loader.h | 1 |
4 files changed, 6 insertions, 22 deletions
@@ -1,3 +1,9 @@ +2005-09-23 Jeremy Katz <katzj@redhat.com> + + * loader2/loader.c: Don't load parallel port module. (#169135) + * loader2/loader.h (LOADER_FLAGS_NOPARPORT): Remove unused flag. + * loader2/hardware.c (initializeParallelPort): Remove unused code. + 2005-09-22 Chris Lumens <clumens@redhat.com> * exception.py: Added a button to the exception dialog for saving diff --git a/loader2/hardware.c b/loader2/hardware.c index b54feb5a4..aa949b86c 100644 --- a/loader2/hardware.c +++ b/loader2/hardware.c @@ -158,25 +158,6 @@ int scsiTapeInitialize(moduleList modLoaded, moduleDeps modDeps, } -/* This loads the necessary parallel port drivers for printers so that - kudzu can autodetect and setup printers in post install*/ -void initializeParallelPort(moduleList modLoaded, moduleDeps modDeps, - moduleInfoSet modInfo, int flags) { - /* JKFIXME: this could be useful on other arches too... */ -#if !defined (__i386__) - return; -#endif - if (FL_NOPARPORT(flags)) return; - - logMessage(INFO, "loading parallel port drivers..."); - if (mlLoadModuleSetLocation("parport_pc", modLoaded, modDeps, - modInfo, flags, - secondStageModuleLocation)) { - logMessage(ERROR, "failed to load parport_pc module"); - return; - } -} - int probeiSeries(moduleInfoSet modInfo, moduleList modLoaded, moduleDeps modDeps, int flags) { /* this is a hack since we can't really probe on iSeries */ diff --git a/loader2/loader.c b/loader2/loader.c index c59f9d96f..f300cc0cf 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1421,8 +1421,6 @@ int main(int argc, char ** argv) { modLoaded, modDeps, modInfo, flags, secondStageModuleLocation); - initializeParallelPort(modLoaded, modDeps, modInfo, flags); - usbInitializeMouse(modLoaded, modDeps, modInfo, flags); /* we've loaded all the modules we're going to. write out a file diff --git a/loader2/loader.h b/loader2/loader.h index d6cf1a77c..f6ac52b36 100644 --- a/loader2/loader.h +++ b/loader2/loader.h @@ -29,7 +29,6 @@ #define LOADER_FLAGS_MEDIACHECK (1 << 22) #define LOADER_FLAGS_NOUSBSTORAGE (1 << 23) #define LOADER_FLAGS_ASKMETHOD (1 << 24) -#define LOADER_FLAGS_NOPARPORT (1 << 25) #define LOADER_FLAGS_NOIEEE1394 (1 << 26) #define LOADER_FLAGS_NOFB (1 << 27) #define LOADER_FLAGS_CMDLINE (1 << 28) |