-From 17589e37dff9745d9c219973a77031905cb57973 Mon Sep 17 00:00:00 2001
+From 46eadeb2ec2cc6153ee45396dc3c90f85ce79d7e Mon Sep 17 00:00:00 2001
From: Andrew Litt <ajlitt@splunge.net>
Date: Mon, 11 Jan 2016 07:54:21 +0000
-Subject: [PATCH 124/232] bcm2835-mmc: Don't override bus width capabilities
+Subject: [PATCH 124/304] bcm2835-mmc: Don't override bus width capabilities
from devicetree
Take out the force setting of the MMC_CAP_4_BIT_DATA host capability