Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / include / linux / switchtec.h

diff --git a/include/linux/switchtec.h b/include/linux/switchtec.h
index be24056..48fabe3 100644 (file)
--- a/include/linux/switchtec.h
+++ b/include/linux/switchtec.h
@@ -337,8 +337,6 @@ enum {
        NTB_CTRL_REQ_ID_EN = 1 << 0,
 
        NTB_CTRL_LUT_EN = 1 << 0,
-
-       NTB_PART_CTRL_ID_PROT_DIS = 1 << 0,
 };
 
 struct ntb_ctrl_regs {