diff --git a/[refs] b/[refs] index 037fea75be01..562c5a168fd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f79d7e6f6ae397caf219cef1392ca39b3ff10833 +refs/heads/master: fecc73519439361eab21fb3cebec504672ef0e03 diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig index 583f66cd5bbd..654a5e94e0e7 100644 --- a/trunk/drivers/net/Kconfig +++ b/trunk/drivers/net/Kconfig @@ -245,6 +245,8 @@ source "drivers/net/ethernet/Kconfig" source "drivers/net/fddi/Kconfig" +source "drivers/net/hippi/Kconfig" + config NET_SB1000 tristate "General Instruments Surfboard 1000" depends on PNP diff --git a/trunk/drivers/net/hippi/Kconfig b/trunk/drivers/net/hippi/Kconfig index 7393eb732ee6..95eb34fdbba7 100644 --- a/trunk/drivers/net/hippi/Kconfig +++ b/trunk/drivers/net/hippi/Kconfig @@ -36,4 +36,4 @@ config ROADRUNNER_LARGE_RINGS kernel code or by user space programs. Say Y here only if you have the memory. -endif /* HIPPI */ +endif # HIPPI