diff -ruP -X ../ignorediff linux-2.4.7-pre7-benh20010722-volume/drivers/macintosh/adbhid.c linux-2.4.7-pre7-benh20010722-volume2/drivers/macintosh/adbhid.c
--- linux-2.4.7-pre7-benh20010722-volume/drivers/macintosh/adbhid.c	Mon Jul 23 17:28:35 2001
+++ linux-2.4.7-pre7-benh20010722-volume2/drivers/macintosh/adbhid.c	Sun Jul 29 00:32:25 2001
@@ -288,6 +288,9 @@
 	case 0x9:	/* brightness increase */
 	  input_report_key(&adbhid[id]->input, KEY_BRIGHTNESSUP, data[1] == (data[1] & 0xf));
 	  break;
+	case 0xb:	/* eject key */
+	  input_report_key(&adbhid[id]->input, KEY_EJECTCD, data[1] == (data[1] & 0xf));
+	  break;
 	default:
 	  printk(KERN_INFO "Unhandled button code %02x\n",data[1]&0xf);
 	  break;
diff -ruP -X ../ignorediff linux-2.4.7-pre7-benh20010722-volume/drivers/macintosh/mac_hid.c linux-2.4.7-pre7-benh20010722-volume2/drivers/macintosh/mac_hid.c
--- linux-2.4.7-pre7-benh20010722-volume/drivers/macintosh/mac_hid.c	Thu Jun 28 09:29:50 2001
+++ linux-2.4.7-pre7-benh20010722-volume2/drivers/macintosh/mac_hid.c	Sun Jul 29 00:38:43 2001
@@ -200,15 +200,15 @@
 	0, 0, 0, KEY_KPCOMMA, 0, KEY_INTL3, 0, 0,		/* 0x00-0x07 */
 	0, 0, 0, 0, KEY_LANG1, KEY_LANG2, 0, 0,			/* 0x08-0x0f */
 	0, 0, 0, 0, 0, 0, 0, 0,					/* 0x10-0x17 */
-	0, 0, 0, 0, KEY_KPENTER, KEY_RIGHTCTRL, 0, 0,		/* 0x18-0x1f */
-	0, 0, 0, 0, 0, 0, 0, 0,					/* 0x20-0x27 */
+	0, 0, 0, 0, KEY_KPENTER, KEY_RIGHTCTRL, KEY_VOLUMEUP, 0,		/* 0x18-0x1f */
+	0, 0, 0, 0, 0, KEY_VOLUMEDOWN, KEY_MUTE, 0,					/* 0x20-0x27 */
 	0, 0, 0, 0, 0, 0, 0, 0,					/* 0x28-0x2f */
 	0, 0, 0, 0, 0, KEY_KPSLASH, 0, KEY_SYSRQ,		/* 0x30-0x37 */
-	KEY_RIGHTALT, 0, 0, 0, 0, 0, 0, 0,			/* 0x38-0x3f */
+	KEY_RIGHTALT, KEY_BRIGHTNESSUP, KEY_BRIGHTNESSDOWN, 0, 0, 0, 0, 0,			/* 0x38-0x3f */
 	0, 0, 0, 0, 0, 0, 0, KEY_HOME,				/* 0x40-0x47 */
 	KEY_UP, KEY_PAGEUP, 0, KEY_LEFT, 0, KEY_RIGHT, 0, KEY_END, /* 0x48-0x4f */
 	KEY_DOWN, KEY_PAGEDOWN, KEY_INSERT, KEY_DELETE, 0, 0, 0, 0, /* 0x50-0x57 */
-	0, 0, 0, KEY_LEFTMETA, KEY_RIGHTMETA, KEY_COMPOSE, 0, 0, /* 0x58-0x5f */
+	0, 0, 0, KEY_LEFTMETA, KEY_RIGHTMETA, KEY_COMPOSE, KEY_POWER, 0, /* 0x58-0x5f */
 	0, 0, 0, 0, 0, 0, 0, 0,					/* 0x60-0x67 */
 	0, 0, 0, 0, 0, 0, 0, KEY_MACRO,				/* 0x68-0x6f */
 	0, 0, 0, 0, 0, 0, 0, 0,					/* 0x70-0x77 */