Change bd5f12a2476 (ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics)
accidentally removed the ep93xx <mach/gpio.h> instead of making it an empty
file. This causes compilation to fail:
In file included from include/linux/gpio.h:18:0,
from drivers/gpio/gpiolib.c:10:
linux/arch/arm/include/asm/gpio.h:5:23: fatal error: mach/gpio.h: No such file or directory
compilation terminated.
make[2]: *** [drivers/gpio/gpiolib.o] Error 1
Fix this by adding the file back.
Cc: Linus Walleij <redacted>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <redacted>
Signed-off-by: Mika Westerberg <redacted>
---
arch/arm/mach-ep93xx/include/mach/gpio.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-ep93xx/include/mach/gpio.h
diff --git a/arch/arm/mach-ep93xx/include/mach/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h
new file mode 100644
index 0000000..40a8c17
--- /dev/null
+++ b/arch/arm/mach-ep93xx/include/mach/gpio.h
@@ -0,0 +1 @@
+/* empty */
--
1.7.6.3
2011/10/16 Mika Westerberg [off-list ref]:
Change bd5f12a2476 (ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics)
accidentally removed the ep93xx <mach/gpio.h> instead of making it an empty
file. This causes compilation to fail:
OMG git is too smart on me I suspect :-/
The original patch here:
http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7042/3
Does not delete it AFAICT:
diff --git a/arch/arm/mach-ep93xx/include/mach/gpio.h
b/arch/arm/mach-ep93xx/include/mach/gpio.h
index 76c68fa..e69de29 100644
--- a/arch/arm/mach-ep93xx/include/mach/gpio.h
+++ b/arch/arm/mach-ep93xx/include/mach/gpio.h
If it was deleting it, second line should say /dev/null should it not?
Is this because git won't create files with zero content during checkout
or so :-/
Or because git am takes zero length as deletion?
Help, I need to figure out how not to do the same stupid mistake again...
Acked-by.
Yours,
Linus Walleij
On Sunday, October 16, 2011 1:08 AM, Mika Westerberg wrote:
quoted hunk
Change bd5f12a2476 (ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics)
accidentally removed the ep93xx <mach/gpio.h> instead of making it an empty
file. This causes compilation to fail:
In file included from include/linux/gpio.h:18:0,
from drivers/gpio/gpiolib.c:10:
linux/arch/arm/include/asm/gpio.h:5:23: fatal error: mach/gpio.h: No such file or directory
compilation terminated.
make[2]: *** [drivers/gpio/gpiolib.o] Error 1
Fix this by adding the file back.
Cc: Linus Walleij <redacted>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ryan Mallon <redacted>
Signed-off-by: Mika Westerberg <redacted>
---
arch/arm/mach-ep93xx/include/mach/gpio.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-ep93xx/include/mach/gpio.h
diff --git a/arch/arm/mach-ep93xx/include/mach/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h
new file mode 100644
index 0000000..40a8c17
--- /dev/null
+++ b/arch/arm/mach-ep93xx/include/mach/gpio.h
@@ -0,0 +1 @@
+/* empty */
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Thanks!