Message ID 4f6ba3b0911021339v20d7692fm52bcd5208002d6e4@mail.gmail.com
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Bob Beers Nov. 2, 2009, 9:39 p.m.
On Mon, Nov 2, 2009 at 4:35 PM, Bob Beers <bob.beers@gmail.com> wrote:

> I should be able to fix those things an generate another patch file,
>  but my git skills are very weak, so I guess you have the options:
>  fix it up by hand, or teach me a little more git, so I can submit
>  a better patch.

Here is patch on top of previous patch to fix the two mistakes:



Bob Beers Nov. 6, 2009, 3:25 p.m. | #1
Hi Greg,

I don't mean to seem impatient, but is cxt1e1 in staging yet?

When it is, do I 'git pull' or re-baseline, or what? I don't mean
 to cause you too much extra work, but once I get the hang of
 this, I should be giving more than I'm taking.

I started over with a git clone of 2.6.31.y (vs 2.6.32.rcX) and
 could submit a new patch that does not have the two Makefile
 errors.  It compiles and I can modprobe the driver, but on
 modprobe -r, or attempting to use the pmcc4cfg util, my
 system locks up, maybe due to the incomplete port of the
 2 INIT_WORK() calls.

I want to first fix the unload problem, then remove all the
 kernel version checking stuff.  After that, I thought would be
 a good time to start fixing coding style issues, so that it will
 not be too painful for others to look at.

BTW, where should the pmcc4cfg source code go?  It needs a
 change in the Makefile before it compiles correctly.

Greg KH Nov. 6, 2009, 10:05 p.m. | #2
On Fri, Nov 06, 2009 at 10:25:36AM -0500, Bob Beers wrote:
> Hi Greg,
> I don't mean to seem impatient, but is cxt1e1 in staging yet?

Sorry, no, been swamped with -stable updates.  I should get to it later
today, I'll email you then if I have any problems.  If not, you'll get
an email saying the patch was added to the tree.


greg k-h
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index ebc96c7..19d14bc 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -29,7 +29,6 @@  obj-$(CONFIG_DSCC4)             += dscc4.o
 obj-$(CONFIG_X25_ASY)          += x25_asy.o

 obj-$(CONFIG_LANMEDIA)         += lmc/
-obj-$(CONFIG_CXT1E1)           += cxt1e1/

 obj-$(CONFIG_DLCI)             += dlci.o
 obj-$(CONFIG_SDLA)             += sdla.o
diff --git a/drivers/staging/cxt1e1/Makefile b/drivers/staging/cxt1e1/Makefile
index edfad71..10020d7 100644
--- a/drivers/staging/cxt1e1/Makefile
+++ b/drivers/staging/cxt1e1/Makefile
@@ -1,4 +1,3 @@ 
 obj-$(CONFIG_CXT1E1)   += cxt1e1.o