--- doc/hwinfo.8.orig
+++ doc/hwinfo.8
@@ -71,10 +71,6 @@
 .B zip.
 .\"
 .\"
-.SH FILES
-.B /var/lib/hardware/*
-.\"
-.\"
 .SH BUGS
 Not all hardware can be detected.
 .\"
@@ -87,6 +83,6 @@
 .\"
 .\"
 .SH "SEE ALSO"
-Documentation in /usr/share/doc/packages/hwinfo.
+discover(8).
 .\"
 .\" EOF

--- src/hd/kbd.c.orig
+++ src/hd/kbd.c
@@ -142,10 +142,12 @@
   }
 
   if(!dev && (fd = open(DEV_CONSOLE, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0) {
+    /* Removing since TIOCGDEV isn't supported in the mainline kernel
     if(ioctl(fd, TIOCGDEV, &u) != -1) {
       tty_major = (u >> 8) & 0xfff;
       tty_minor = (u & 0xff) | ((u >> 12) & 0xfff00);
       ADD2LOG(DEV_CONSOLE ": major %u, minor %u\n", tty_major, tty_minor);
     }
+    */
 
     if(0)

--- src/hd/hd.c.orig
+++ src/hd/hd.c
@@ -142,6 +142,14 @@
 #define HD_ARCH "hppa"
 #endif
 
+#ifdef __mc68000__
+#define HD_ARCH "m68k"
+#endif
+
+#ifdef __powerpc64__
+#define HD_ARCH "ppc64"
+#endif
+
 typedef struct disk_s {
   struct disk_s *next;
   unsigned crc;

--- src/hd/kbd.c.orig
+++ src/hd/kbd.c
@@ -45,7 +45,6 @@
 typedef unsigned int u_int;
 #endif
 
-#include <asm/kbio.h>
 #include <asm/openpromio.h>
 #endif
 
@@ -255,8 +255,6 @@
 
   if((fd = open(DEV_KBD, O_RDWR | O_NONBLOCK | O_NOCTTY)) >= 0)
     {
-      if(ioctl(fd, KIOCTYPE, &kid)) kid = -1;
-      if(ioctl(fd, KIOCLAYOUT, &klay)) klay = -1;
       close(fd);
 
       if(kid != -1)

--- src/hd/cpu.c.orig
+++ src/hd/cpu.c
@@ -104,6 +104,7 @@
 #ifdef __alpha__
   char model_id[80], system_id[80], serial_number[80], platform[80];
   unsigned cpu_variation, cpu_revision, u, hz;
+  double bogo;
   cpu_info_t *ct1;
 #endif
 
@@ -133,6 +134,7 @@
 #ifdef __alpha__
   *model_id = *system_id = *serial_number = *platform = 0;
   cpu_variation = cpu_revision = hz = 0;
+  bogo = 0;
 
   for(sl = hd_data->cpu; sl; sl = sl->next) {
     if(sscanf(sl->str, "cpu model : %79[^\n]", model_id) == 1) continue;
@@ -143,6 +145,7 @@
     if(sscanf(sl->str, "cpus detected : %u", &cpus) == 1) continue;
     if(sscanf(sl->str, "cycle frequency [Hz] : %u", &hz) == 1) continue;
     if(sscanf(sl->str, "system variation : %79[^\n]", platform) == 1) continue;
+    if(sscanf(sl->str, "BogoMIPS : %lg", &bogo) == 1) continue;
   }
 
   if(*model_id || *system_id) {	/* at least one of those */

--- src/hd/kbd.c.orig
+++ src/hd/kbd.c
@@ -21,26 +21,6 @@
 
 #ifdef __sparc__
 
-struct serial_struct {
-  int     type;
-  int     line;
-  unsigned long   port;
-  int     irq;
-  int     flags;
-  int     xmit_fifo_size;
-  int     custom_divisor;
-  int     baud_base;
-  unsigned short  close_delay;
-  char    io_type;
-  char    reserved_char[1];
-  int     hub6;
-  unsigned short  closing_wait; /* time to wait before closing */
-  unsigned short  closing_wait2; /* no longer used... */
-  unsigned char   *iomem_base;
-  unsigned short  iomem_reg_shift;
-  int     reserved[2];
-};
-
 #ifdef DIET
 typedef unsigned int u_int;
 #endif