diff options
| -rw-r--r-- | include/linux/pnp.h | 4 | ||||
| -rw-r--r-- | net/ipv4/raw.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/pnp.h b/include/linux/pnp.h index 5dc223b39724..9c805c67dea7 100644 --- a/include/linux/pnp.h +++ b/include/linux/pnp.h @@ -245,10 +245,10 @@ struct pnp_dev *pnp_find_dev(struct pnp_card *card, /* just in case anyone decides to call these without PnP Support Enabled */ static inline int pnp_protocol_register(struct pnp_protocol *protocol) { return -ENODEV; } -static inline void pnp_protocol_unregister(struct pnp_protocol *protocol) { ; ) +static inline void pnp_protocol_unregister(struct pnp_protocol *protocol) { } static inline int pnp_init_device(struct pnp_dev *dev) { return -ENODEV; } static inline int pnp_add_device(struct pnp_dev *dev) { return -ENODEV; } -static inline void pnp_remove_device(struct pnp_dev *dev) { ; } +static inline void pnp_remove_device(struct pnp_dev *dev) { } static inline struct pnp_resources * pnp_build_resource(struct pnp_dev *dev, int dependent) { return NULL; } static inline struct pnp_resources * pnp_find_resources(struct pnp_dev *dev, int depnum) { return NULL; } static inline int pnp_get_max_depnum(struct pnp_dev *dev) { return -ENODEV; } diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 88bbbfa460d8..02179296ae54 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -64,7 +64,7 @@ #include <net/raw.h> #include <net/inet_common.h> #include <net/checksum.h> -#include <linux/netfilter.h> +#include <linux/netfilter_ipv4.h> struct sock *raw_v4_htable[RAWV4_HTABLE_SIZE]; rwlock_t raw_v4_lock = RW_LOCK_UNLOCKED; |