--- linux-2.6.29/drivers/input/keyboard/atkbd.c	2009-06-11 09:22:11.000000000 -0400
+++ linux-2.6.29/drivers/input/keyboard/atkbd.c	2009-06-10 23:51:37.000000000 -0400
@@ -901,6 +901,23 @@ 
 }
 
 /*
+ * Perform fixup for HP Presario R4000/R4100 laptops that don't generate
+ * release for their volume buttons
+ */
+static void atkbd_hp_r4000_keymap_fixup(struct atkbd *atkbd)
+{
+	const unsigned int forced_release_keys[] = {
+		0xae, 0xb0,
+	};
+	int i;
+
+	if (atkbd->set == 2)
+		for (i = 0; i < ARRAY_SIZE(forced_release_keys); i++)
+			__set_bit(forced_release_keys[i],
+					atkbd->force_release_mask);
+}
+
+/*
  * Samsung NC10 with Fn+F? key release not working
  */
 static void atkbd_samsung_keymap_fixup(struct atkbd *atkbd)
@@ -1536,6 +1553,24 @@ 
 		.driver_data = atkbd_hp_zv6100_keymap_fixup,
 	},
 	{
+		.ident = "Compaq Presario R4000",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4000"),
+		},
+		.callback = atkbd_setup_fixup,
+		.driver_data = atkbd_hp_r4000_keymap_fixup,
+	},
+	{
+		.ident = "Compaq Presario R4100",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4100"),
+		},
+		.callback = atkbd_setup_fixup,
+		.driver_data = atkbd_hp_r4000_keymap_fixup,
+	},
+	{
 		.ident = "Inventec Symphony",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "INVENTEC"),