From 1c127217df70ba25d0eb611688063c245fb2c36d Mon Sep 17 00:00:00 2001 From: Robert F-C Date: Mon, 29 Apr 2013 22:03:37 +1000 Subject: [PATCH] Make DOGLCD merge neater. --- Marlin/Marlin.pde | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Marlin/Marlin.pde b/Marlin/Marlin.pde index 8514216e6..e02803ceb 100644 --- a/Marlin/Marlin.pde +++ b/Marlin/Marlin.pde @@ -40,10 +40,7 @@ #elif defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008) #include #include - #else - #include - #endif - #ifdef DOGLCD + #elif defined(DOGLCD) #include // library for graphics LCD by Oli Kraus (https://code.google.com/p/u8glib/) #else #include // library for character LCD