From: Hauke Mehrtens Date: Sat, 1 Jun 2013 16:00:17 +0000 (+0200) Subject: backports: do not backport struct watchdog_device in RHEL 6.4 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=23512cfbff432fa4f4f6f5bf54ca4478d5e95dba;p=openwrt%2Fstaging%2Fblogic.git backports: do not backport struct watchdog_device in RHEL 6.4 This is already included in the RHEL 6.4 kernel. 1 2.6.24 [ OK ] 2 2.6.25 [ OK ] 3 2.6.26 [ OK ] 4 2.6.27 [ OK ] 5 2.6.28 [ OK ] 6 2.6.29 [ OK ] 7 2.6.30 [ OK ] 8 2.6.31 [ OK ] 9 2.6.32 [ OK ] 10 2.6.33 [ OK ] 11 2.6.34 [ OK ] 12 2.6.35 [ OK ] 13 2.6.36 [ OK ] 14 2.6.37 [ OK ] 15 2.6.38 [ OK ] 16 2.6.39 [ OK ] 17 3.0.79 [ OK ] 18 3.1.10 [ OK ] 19 3.10-rc1 [ OK ] 20 3.2.45 [ OK ] 21 3.3.8 [ OK ] 22 3.4.46 [ OK ] 23 3.5.7 [ OK ] 24 3.6.11 [ OK ] 25 3.7.10 [ OK ] 26 3.8.13 [ OK ] 27 3.9.3 [ OK ] Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- diff --git a/backport/backport-include/linux/watchdog.h b/backport/backport-include/linux/watchdog.h index 4aae6bbc11c0..fb6853533474 100644 --- a/backport/backport-include/linux/watchdog.h +++ b/backport/backport-include/linux/watchdog.h @@ -2,9 +2,11 @@ #define __BACKPORT_WATCHDOG_H #include_next +#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4)) #if LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0) struct watchdog_device { }; #endif +#endif #endif /* __BACKPORT_WATCHDOG_H */