rereverted Matt's patches

2 files changed, 4 insertions, 21 deletions

diff --git a/edd/Makefile b/edd/Makefile
index 320b99e32..b49db086b 100644
--- a/edd/Makefile
+++ b/edd/Makefile
@@ -2,8 +2,7 @@ include ../Makefile.inc
 
 CFLAGS=-Wall -O -g -fpic -I/usr/include/python1.5# -DDEBUG
 
-libedd.a(edd.o lrmi.o)
-TARGETS=eddmodule.so 
+TARGETS=eddmodule.so libedd.a(edd.o lrmi.o)
 
 ifeq (.depend,$(wildcard .depend))
 TARGET=all
@@ -21,9 +20,9 @@ install: all
 edd: lrmi.c edd.c
 	gcc -DDEBUG -o edd lrmi.c edd.c
 
-eddmodule.so: pyedd.c # edd.o lrmi.o
+eddmodule.so: pyedd.c edd.o lrmi.o
 	gcc -c -o pyedd.o -fpic pyedd.c $(CFLAGS)
-	gcc -shared -g -o $@ pyedd.o # edd.o lrmi.o
+	gcc -shared -g -o $@ pyedd.o edd.o lrmi.o
 
 clean:
 	rm -f *.o *.so *~ core
diff --git a/edd/edd.c b/edd/edd.c
index 0076f0456..039301bd6 100644
--- a/edd/edd.c
+++ b/edd/edd.c
@@ -55,8 +55,6 @@ edd_get_parameters (EDDCapability *ec)
   struct LRMI_regs regs;
   EDDParameters *ep, *ret;
 
-  return NULL;
-
   if (edd_lrmi_init() == EDD_ERROR) {
     return NULL;
   }
@@ -107,21 +105,7 @@ EDDCapability *
 edd_supported(int drive)
 {
   struct LRMI_regs regs;
-
-  FILE *f = fopen("/proc/cmdline", "r");
-  if (f) {
-      char buf[100];
-      fgets(buf, sizeof(buf) - 1, f);
-      fclose(f);
-      if (strstr(buf, "lba32")) {
-	  EDDCapability *ec = malloc (sizeof (EDDCapability));
-	  ec->edd = 1;
-	  return rc;
-      }
-      return NULL;
-  }
-  return NULL; 
- 
+  
   if (edd_lrmi_init() == EDD_ERROR) {
     return NULL;
   }