# HG changeset patch # User Louis Opter # Date 1329649734 -3600 # Node ID c189b4b4406093c9ab61de529e76ef4515d1bd11 # Parent 3d37fa01b19c9e0536fbcd7b26f4e491332d51d5# Parent 6e9dcbd120c593259e0e56e44fa46c6874b91d18 Automated merge with https://www.kalessin.fr/projs/hg/epitech/mq/rathaxes/ diff -r 6e9dcbd120c5 -r c189b4b44060 rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch --- a/rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch Sun Feb 19 12:07:53 2012 +0100 +++ b/rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch Sun Feb 19 12:08:54 2012 +0100 @@ -656,7 +656,7 @@ diff --git a/rathaxes/samples/e1000/lkm.rtx b/rathaxes/samples/e1000/lkm.rtx --- a/rathaxes/samples/e1000/lkm.rtx +++ b/rathaxes/samples/e1000/lkm.rtx -@@ -2,50 +2,61 @@ +@@ -2,50 +2,62 @@ { Ethernet::open(Ethernet::Device dev) { @@ -679,6 +679,7 @@ + Log::info("device activated"); + + e1000::activate_device_interruption(dev); ++ Log::info("interruption enabled"); + + e1000::print_status(dev); }