diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-01-27 06:29:13 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-01-27 06:29:37 -0500 |
| commit | f97b12cce6dea51880a6a89d4607c29c70a6a841 (patch) | |
| tree | 1f05f6d39975bd213e7506e8a73ae0a59188c75e /net/lapb | |
| parent | ccaa8d657117bb1876d471bd91579d774106778d (diff) | |
| parent | 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff) | |
Merge commit 'v2.6.38-rc2' into core/locking
Reason: Update to mainline before adding the locking cleanup
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/lapb')
| -rw-r--r-- | net/lapb/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/lapb/Makefile b/net/lapb/Makefile index 53f7c90db163..fff797dfc88c 100644 --- a/net/lapb/Makefile +++ b/net/lapb/Makefile | |||
| @@ -4,4 +4,4 @@ | |||
| 4 | 4 | ||
| 5 | obj-$(CONFIG_LAPB) += lapb.o | 5 | obj-$(CONFIG_LAPB) += lapb.o |
| 6 | 6 | ||
| 7 | lapb-objs := lapb_in.o lapb_out.o lapb_subr.o lapb_timer.o lapb_iface.o | 7 | lapb-y := lapb_in.o lapb_out.o lapb_subr.o lapb_timer.o lapb_iface.o |