diff options
author | Jeff Garzik <jeff@garzik.org> | 2008-08-07 04:05:46 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-08-07 04:05:46 -0400 |
commit | 3859069bc3358772b08bd91efe9edec39a746ea8 (patch) | |
tree | 9ffe71711dd98cf511ad21d9990c597de0ac3b2b /drivers/net/wan/lmc/lmc_ioctl.h | |
parent | e2c709b0ba2886b5438b666222b4b3faf82d65a9 (diff) | |
parent | 867240f7b2a37b1be4ba37d904a9064a96c82099 (diff) |
Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp
Diffstat (limited to 'drivers/net/wan/lmc/lmc_ioctl.h')
-rw-r--r-- | drivers/net/wan/lmc/lmc_ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/lmc/lmc_ioctl.h b/drivers/net/wan/lmc/lmc_ioctl.h index 57dd861cd3db..72fb113a44ca 100644 --- a/drivers/net/wan/lmc/lmc_ioctl.h +++ b/drivers/net/wan/lmc/lmc_ioctl.h | |||
@@ -61,7 +61,7 @@ | |||
61 | /* | 61 | /* |
62 | * IFTYPE defines | 62 | * IFTYPE defines |
63 | */ | 63 | */ |
64 | #define LMC_PPP 1 /* use sppp interface */ | 64 | #define LMC_PPP 1 /* use generic HDLC interface */ |
65 | #define LMC_NET 2 /* use direct net interface */ | 65 | #define LMC_NET 2 /* use direct net interface */ |
66 | #define LMC_RAW 3 /* use direct net interface */ | 66 | #define LMC_RAW 3 /* use direct net interface */ |
67 | 67 | ||