Mercurial > archived > louis > epitech > mq > rathaxes
diff rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch @ 68:ef460b936b5f
Merge + remove patch from David
author | Louis Opter <louis@lse.epitech.net> |
---|---|
date | Sat, 18 Feb 2012 16:04:02 +0100 |
parents | b916396fc577 |
children | 8bb53638585b |
line wrap: on
line diff
--- a/rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch Sat Feb 18 15:57:45 2012 +0100 +++ b/rathaxes_correctly_use_chunk_and_template_sequences_parameters_in_e1000.patch Sat Feb 18 16:04:02 2012 +0100 @@ -508,7 +508,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,44 +2,44 @@ +@@ -2,50 +2,50 @@ { Ethernet::open(Ethernet::Device dev) { @@ -562,6 +562,13 @@ LKM::author = "Rathaxes"; LKM::description = "Hello World Loadable Kernel Module (LKM)"; LKM::license = "GPL"; + + PCI::vendor_id = 0x8086; +- PCI::product_id = 0x100f; ++ PCI::product_id = 0x100e; + PCI::set_master = true; + + Ethernet::ifname = "rtx%d"; diff --git a/rathaxes/samples/e1000/log.blt b/rathaxes/samples/e1000/log.blt --- a/rathaxes/samples/e1000/log.blt +++ b/rathaxes/samples/e1000/log.blt