Merge branch 'master' of grenfell.avtechpulse.com:Instrument

Conflicts:
	instr-daemon.c

1 files changed, 2 insertions, 2 deletions

diff --git a/bus.c b/bus.c
index 3c83eac..bcd916f 100644
--- a/bus.c
+++ b/bus.c
@@ -200,8 +200,8 @@ static void gpmc_setup(void)
 
 	int WRACCESSTIME = DATA_READY;
 	int config6 = WRACCESSTIME << 24;
-	
-	
+
+
 	pinmux_configurepin("gpmc_csn0", 	PULL_UP | MODE_0);
 	pinmux_configurepin("gpmc_oen_ren", 	PULL_UP | MODE_0);
 	pinmux_configurepin("gpmc_wen", 	PULL_UP | MODE_0);