diff --git a/neutron/conf/plugins/ml2/drivers/mech_sriov/agent_common.py b/neutron/conf/plugins/ml2/drivers/mech_sriov/agent_common.py
index 679ac222f8e..251fa76997c 100644
--- a/neutron/conf/plugins/ml2/drivers/mech_sriov/agent_common.py
+++ b/neutron/conf/plugins/ml2/drivers/mech_sriov/agent_common.py
@@ -21,12 +21,6 @@ from neutron._i18n import _
 DEFAULT_DEVICE_MAPPINGS = []
 DEFAULT_EXCLUDE_DEVICES = []
 
-agent_opts = [
-    cfg.IntOpt('polling_interval', default=2,
-               help=_("The number of seconds the agent will wait between "
-                      "polling for local device changes.")),
-]
-
 sriov_nic_opts = [
     cfg.ListOpt('physical_device_mappings',
                 default=DEFAULT_DEVICE_MAPPINGS,
@@ -53,5 +47,4 @@ sriov_nic_opts = [
 
 
 def register_agent_sriov_nic_opts(cfg=cfg.CONF):
-    cfg.register_opts(agent_opts, 'AGENT')
     cfg.register_opts(sriov_nic_opts, 'SRIOV_NIC')
diff --git a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
index 2f967e3882c..39674ed4edd 100644
--- a/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
+++ b/neutron/plugins/ml2/drivers/mech_sriov/agent/common/config.py
@@ -18,6 +18,7 @@ from oslo_config import cfg
 
 from neutron._i18n import _
 from neutron.conf.agent import common as config
+from neutron.conf.plugins.ml2.drivers import agent
 from neutron.conf.plugins.ml2.drivers.mech_sriov import agent_common as \
      agent_common_config
 
@@ -54,5 +55,6 @@ def parse_exclude_devices(exclude_list):
     return exclude_mapping
 
 
+agent.register_agent_opts()
 agent_common_config.register_agent_sriov_nic_opts()
 config.register_agent_state_opts_helper(cfg.CONF)