[ubuntu-gutsy-lum] Allow e1000-ich9 and e1000 to coexist

[Amit Kucheria]

On 7/3/07, Kyle McMartin <kyle at ubuntu.com> wrote:
> Might be nice to let both coexist... Otherwise a nasty kobject warning
> and a BUG_ON backtrace are in your future, as two drivers try to
> register the same name.
>
> Signed-off-by: Kyle McMartin <kyle at ubuntu.com>
>
> diff --git a/ubuntu/net/e1000-ich9/e1000_main.c b/ubuntu/net/e1000-ich9/e1000_main.c
> index 60b16bc..5fcd429 100644
> --- a/ubuntu/net/e1000-ich9/e1000_main.c
> +++ b/ubuntu/net/e1000-ich9/e1000_main.c
> @@ -56,7 +56,7 @@
>
>  #include "e1000.h"
>
> -char e1000_driver_name[] = "e1000";
> +char e1000_driver_name[] = "e1000-ich9";
>  static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
>
>  #ifdef CONFIG_E1000_NAPI
>
> --

Looks sane. Applied to LUM. Thanks.